gentoo resync : 22.12.2021

19 files changed, 119 insertions, 251 deletions

diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 2efa8844c762..68dea4b6cf41 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index cab419dc4d3d..0abba71d6aba 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -2,6 +2,8 @@ AUX 51-pulseaudio-probe.conf 437 BLAKE2B 5eb7afb4bef1e647cfa1c3e9d6417000c0e74f2
 AUX pulse-default.conf 196 BLAKE2B 4293e2ba9b4c87c35e3bdfe45781f86af733341c8bada5a78b38d08c59c5774e5679487e877d11fb7866b2ed7d9f9441552f864e9c2b9e42119eda62e1459ae8 SHA512 c64f73a46c9f50704d4b2bef09d95ce3bc2352da1437750f49974ab8e6f60d5467d5d94ab0e1490deea5f2b1f67b20aa60a10c502e7d6e049649bca4208f7c1e
 DIST alsa-plugins-1.2.2.tar.bz2 406494 BLAKE2B 64148e3e6fcf651a2ac62b6b5f3cc915fe6718d35fea53da08f6f4b1a5ff06ba29e69b8cd2a95e3b9edf3880570b1d0b9267239f705043dab592c27fdd150ef3 SHA512 25a7dfaa64be024447d889b5cde668f1308d197f54880548a82d50beb4ac0dbff33b415da1e26dc5229408c934247a9bd38acfb0f82ca388deac0d77ab3cdadb
 DIST alsa-plugins-1.2.5.tar.bz2 406134 BLAKE2B a1bb2f187c92a2999722e22775baf2c1fc4240162bb71f454c60359ef61b46934ff8ecd5af97589bafe2c7f737530cf5a4dcc139af7ed001d8dfe24bf3ae045c SHA512 32aa475ec4af040861c2bfb01eac71042242d2109d3c5102d0111f3327e3f6c9031c32cbb50eb4b6568a6bd9408691a047a39972f09d6087e31ec11f19ddc9cf
+DIST alsa-plugins-1.2.6.tar.bz2 408596 BLAKE2B bead0b9514725560a4fb738c4b1e14b148bf888cc82e0d7611cb6c494ed97a7e366b57f233095372c26a7bd614655bd58a6505202910de421561b540c94d5cca SHA512 ac54a6f227f1ca5f6e01e08d869e7c06f4bcd68f148932e1902a6fcf3e5ccd3667ac4d8c1a00b77e4b5cb27e17c01cf7526ded4aaf35c4b26fc69e14e6e341f9
 EBUILD alsa-plugins-1.2.2.ebuild 3043 BLAKE2B 765efc4efd1a9066af87a18fda76c6b3699069bd369e65b255988b9a5bcbfd59a8e805bcfc17ac1e0c35422f25185009511822f19792e8893882286dc5d07801 SHA512 c71161cb35b059916c5493bf3830d3e072f9e0840fdd5df41b2e6c71f70b4cb7ce2df37550c7a612c7fb0eeaf84c86b1061f69b9791cbd8424427df42cf0dd92
 EBUILD alsa-plugins-1.2.5.ebuild 3050 BLAKE2B 5500ac442070171a1fdb75dd95578bcc264005c2667a82ea8de9956cdde60b1e90bf38890b3d92bf40530dcfa109f7ab439bbde701148dd44629fd4fd5d597a2 SHA512 35c9f1732e65c4059e246d4e150a11ba3afcf50592438c8cd221d548856039138363dea7fc2ae0db3506fa9e2ef3a78accc9b6d644cb86f973a93c1a45627a8d
+EBUILD alsa-plugins-1.2.6.ebuild 3050 BLAKE2B c2bd1c77fc3ce4ad343076c78fda99f23347a0cd307b483c0f3b2b5a81f1e41b68ff770d681cbb84917b31549191eda2430f8808d602516d91051ced03755645 SHA512 ae87a3872ba2d0ba3bf7d54fcabb96fabd15c4242da78360ccd4df2bbd065f42a446b1f0d9e1c0bd4054f71a8a5aae9c053d347c45e51bcd15a600fc8c3d661c
 MISC metadata.xml 513 BLAKE2B e1725c32fd402ffd327c40965ea3f632237a6533bba78d4be59d729de1e46c24727aa7037aa185bac5da5c3066c03caf47d8047271ea93b4f62b15ac70cc6e81 SHA512 675a6013aec3ea092710b9bea4576495f23445ddb47eb8a230064093457dcccc75bef932036cf0174aad3909890243278bd89af53cf1c6c14ba8a1784070afef
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.2.6.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.2.6.ebuild
new file mode 100644
index 000000000000..5aada389cb21
--- /dev/null
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.2.6.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools flag-o-matic multilib multilib-minimal
+
+DESCRIPTION="ALSA extra plugins"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+SRC_URI="https://www.alsa-project.org/files/pub/plugins/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+IUSE="arcam_av debug ffmpeg jack libsamplerate +mix oss pulseaudio speex +usb_stream"
+
+RDEPEND="
+	>=media-libs/alsa-lib-${PV}:=[${MULTILIB_USEDEP}]
+	ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	speex? (
+		>=media-libs/speex-1.2.0:=[${MULTILIB_USEDEP}]
+		media-libs/speexdsp[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# For some reasons the polyp/pulse plugin does fail with alsaplayer with a
+	# failed assert. As the code works just fine with asserts disabled, for now
+	# disable them waiting for a better solution.
+	sed \
+		-e '/AM_CFLAGS/s:-Wall:-DNDEBUG -Wall:' \
+		-i pulse/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	use debug || append-cppflags -DNDEBUG
+
+	local myeconfargs=(
+		# default does not contain $prefix: bug #673464
+		--with-alsalconfdir="${EPREFIX}"/etc/alsa/conf.d
+
+		--with-speex="$(usex speex lib no)"
+		$(use_enable arcam_av arcamav)
+		$(use_enable ffmpeg libav)
+		$(use_enable jack)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable mix)
+		$(use_enable oss)
+		$(use_enable pulseaudio)
+		$(use_enable speex speexdsp)
+		$(use_enable usb_stream usbstream)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	cd doc || die
+	dodoc upmix.txt vdownmix.txt README-pcm-oss
+	use jack && dodoc README-jack
+	use libsamplerate && dodoc samplerate.txt
+	use ffmpeg && dodoc lavrate.txt a52.txt
+
+	if use pulseaudio; then
+		dodoc README-pulse
+		# install ALSA configuration files
+		# making PA to be used by alsa clients
+		insinto /usr/share/alsa
+		doins "${FILESDIR}"/pulse-default.conf
+		insinto /usr/share/alsa/alsa.conf.d
+		doins "${FILESDIR}"/51-pulseaudio-probe.conf
+		# bug #410261, comment 5+
+		# seems to work fine without any path
+		sed \
+			-e "s:/usr/lib/alsa-lib/::" \
+			-i "${ED}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261
+		dosym ../../../usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf \
+			/etc/alsa/conf.d/51-pulseaudio-probe.conf #670960
+	fi
+
+	find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die
+}
+
+pkg_postinst() {
+	if use pulseaudio; then
+		einfo "The PulseAudio device is now set as the default device if the"
+		einfo "PulseAudio server is found to be running. Any custom"
+		einfo "configuration in /etc/asound.conf or ~/.asoundrc for this"
+		einfo "purpose should now be unnecessary."
+	fi
+}
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index 0d4822958888..96986c1ce12b 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,5 +1,5 @@
 DIST audacious-plugins-4.0.5.tar.bz2 1759133 BLAKE2B b806ac110875f94f6e0f1db757d2ec0c7a0391f83efeb068f3e79c7e994fa33d0045095669b5e7ec771714419aaa98b0d0125a5dd18a00f4ee23fc899142858f SHA512 90ab2edbfc797fa835aae9937b5f478a0ca575f31c443d9e8ba7394e1615f605beb417372872874c94d4f804dba7bea9fbae2078e162178386683d8a3e36c108
 DIST audacious-plugins-4.1.tar.bz2 1802825 BLAKE2B 253fddf82408708d8094836088bec1b9b7c932e75c959443579e4bbdc3a4b850757328d90b1ab7a6a0bdd85120d4b0a901f9fa22638f90938f19fd0fa35012ba SHA512 4adad3b4e9c264d52c6523fe84db56b9a87476a4ad5a86f85456a7e0276758d61675022e9e3da07e061dac45f604e54f83f9db85a37f0aaf0b75b3356a63932f
 EBUILD audacious-plugins-4.0.5.ebuild 4075 BLAKE2B 811e4373236b03297e42858b455edc1a988eef64fa8b810f566c26842bf457a93246ed3ada021b61640d4079263f8a21deeb3ff1b4b61549cf34582a980464d3 SHA512 88b73fd0db0cd40d173d05f55b57de860a6138595a435d042c210d92bb01126537ff1ab53bd01fe3d435008e1080aa4e119a626f72258dceb5e16b16eb3b7ecb
-EBUILD audacious-plugins-4.1.ebuild 3974 BLAKE2B afd357309c86249530594590ef704378b56b0b312c049c4df851cadb98c08d2a88e3918d5c4920ba5c97075bfe43677a8af5087b539de1dacc879c20da4db9fe SHA512 7ae497e09c2aad3dd52ef508c42bff919d4e6d98b49b96fa1e3797216cf678d90b0361118d4b755ecd6f752411ac35e8aea3b0bd8be4b76c27dbcf810ac94bad
+EBUILD audacious-plugins-4.1.ebuild 3973 BLAKE2B ace0d7d5669a2df24de549304833744e57c067dd5fd53775a69ec546e031854601fb0b98083b888bb8e949731a614b45ea324551133ab69d42c5abf4aad9ce6e SHA512 f92f7b5cef1e421e8751e620b089a9a81639078afe7bad9b8a72ce313e04ef704dc405cc0600f6fff8eabb1964d402f6bddedb7806c0990a29fba1b7df70ea46
 MISC metadata.xml 1347 BLAKE2B 2234e8c67fc7dd226d9f964878b5ee4d59d78cc63761ed2cad469732664f31148d320aed1de0402a504a646ec1db6ea5222673928374d5714b9626235b55f315 SHA512 e3d3eea22b25f86047aed716f7f865a905c619a96490146ba6e0453ba93616e8bf763e1644dddad8a5b7ed2a7509ecf2137f85723b01b2827034863578cf1c64
diff --git a/media-plugins/audacious-plugins/audacious-plugins-4.1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-4.1.ebuild
index 54a949a3a1f4..f22a60ed2049 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-4.1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-4.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Lightweight and versatile audio player"
 HOMEPAGE="https://audacious-media-player.org/"
 SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
 
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="
diff --git a/media-plugins/gst-plugins-gdkpixbuf/Manifest b/media-plugins/gst-plugins-gdkpixbuf/Manifest
index 8494dcaf18e1..c0a8719b788a 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/Manifest
+++ b/media-plugins/gst-plugins-gdkpixbuf/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.16.3.tar.xz 3914676 BLAKE2B 52f18027f9d9a77e8b459a0a10fa7c1450dff2faf8a2a63134f833ad08b19985b7f0d3d2af4b766c9b8bf802d048fabd6f52ad5a7865eccd1fe0d26404b7b2de SHA512 3e0da4a4defc0ddea1c26dfc767fed732548654f4155452649777109a17d5b65b2fde895483a3e35dc1646de5a16e913cd2408f826251d46a99b7751b88dcb65
 DIST gst-plugins-good-1.18.4.tar.xz 3277572 BLAKE2B 8acfb975d19eabc681184d0096328051a9a02e5f849599dbad1233a0e9254e1a2d2bef75d8afdc779a7ca01a71b15d1e83a843749c0ef5f7ab2b5818067ab898 SHA512 764c66383c93e57f9c5e7742002013e07e7b25750d6974d6c07744433e8ceb7570e829e68278e2bc5214f77158311a6b3bfb013d615cf66205d8d7a9e2d54b86
 EBUILD gst-plugins-gdkpixbuf-1.16.3.ebuild 461 BLAKE2B d4aeb5ae1fccc72b2149839b1cfd5de42977a0deda9d06b1b713f1d6ad62332435f611cbb22395022e9a79d923110b9c0de1a45f41bfca1812f4a74a226761a6 SHA512 2ef7680dea47ab8a7de9d198831b9df0f64de98f0021adabf9a2e201bea017ade71ace0030358b86a826c456e52f82d52547743d25d119b5be5583ca5826702f
-EBUILD gst-plugins-gdkpixbuf-1.18.4.ebuild 469 BLAKE2B 9b95fdd0b6a42cb3728076182b63ee60fa7f4d0d34b8a1d70040f5f00f5bb3d7e0070551755fb8b27a2eb3b551c741ef45011bf280545d72483d6a9490ac9aac SHA512 194492ba7f2ab0f31ee7bc83a00e86a733fca10ca90da9f8ab4ab7d650eaad821dc7388994d1039e1a56fa4cda5d3d8541c4a23c8d9967118bff45cf5f28609c
+EBUILD gst-plugins-gdkpixbuf-1.18.4.ebuild 476 BLAKE2B df0f4a90e9bf7a5f675860f11aec38315099b3fc883579650bb94c35a879977a5b88d3e9a3ce8dff3afb56a6164db1eda42ea3a8ed17cc04898138960093f32d SHA512 2c5af15cba0de5f2375225766c98e95233de96d3633a8cfcf9befced0934ce7f1408b70ec109d283fb913f4538b0336d63092aa7e605f76a99e8367d55ba0354
 MISC metadata.xml 611 BLAKE2B ef8ecef60b33cc7ea30268d033d248507e0e18795a1d7856074a3a2bf07c1aef8865ca9d4590d91e3fb0bed076af4b8171e50dd4a88efd9931830f5e25299357 SHA512 a6adad0795f752d27e32b5460ed72bda5ef970d5a6a223974f1ee377dc0a7bafd0007d3294dfbe90ae3a8e4583e96c4fa9f2fec864ba325fb5c4d092c6bc2b8d
diff --git a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.18.4.ebuild b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.18.4.ebuild
index bc1ef0ff1a87..5fe72118e120 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.18.4.ebuild
+++ b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.18.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPION="Image decoder, overlay and sink plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/gdk-pixbuf-2.30.7:2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/imlib2_loaders/Manifest b/media-plugins/imlib2_loaders/Manifest
index 8afcbc6af37c..fcc94ac3095d 100644
--- a/media-plugins/imlib2_loaders/Manifest
+++ b/media-plugins/imlib2_loaders/Manifest
@@ -1,6 +1,6 @@
 AUX imlib2_loaders-1.7.1-loader-api.patch 1637 BLAKE2B 702793e9faf6ff67ec52069a2e6add85094cefcb3a3b46d9038567354fe4cd9d928306c3321b3a7ed3c545c31f8ef9d3105ac43769106b1aea5c28df7ec0f345 SHA512 67930338864745fe13da81832125d3089505dc4178c267a2b0595a75236c1c90cc29acb73e165a970b62efc276cfd541f35ae4f07b98f4eabb7d66d1c67661eb
-DIST imlib2_loaders-1.6.1.tar.gz 375642 BLAKE2B 20f4213e3d84c333faff82910f4f402524e50f567cddcce225678c0706d04c5a9520d8a54956f50be4d42fd231f317573ec091864f1d526336aacc8f7e0ae399 SHA512 1017b3587b2815d8347e9aef3f11649bdaadd48be10fe89d6e6eb8cb1d022723d414869cf12a2bff3eaa2f14c12ffd424767993e07990f8fa3ce5062ab0844fa
 DIST imlib2_loaders-1.7.1.tar.bz2 302348 BLAKE2B 8f73daa5b70d7122c136a001df920649a438edc60d4e7e94b691dfecc0864b66c321c676fb78a2f9e990b842d31fd5f95dcbacf232d6b9809382173449f86673 SHA512 5752768aa61c36e8f8ae5ff9219f950ba7b1561629bb21e4b4e16890d0fa904e93899e64152f05c6d7190553404336ec33b1d88b0cbec46c61a26598e27d449d
-EBUILD imlib2_loaders-1.6.1.ebuild 842 BLAKE2B 9fafbe47bdf42e124be8435dcdec8a85662383c864c346e595b80431fda64c22d853eefc0213f99926483f0451da797d5e0405d81525cc27221545d211b9df3b SHA512 7a4a3fe6ed9c48cbdee20fafc912fa85ad10ec2204e8ba2a96387a7ad58a7655206b444c5fa27c0e47b833e46e548a608dca81e9cdbef79c9a807fca8403ced9
-EBUILD imlib2_loaders-1.7.1.ebuild 894 BLAKE2B 8c389f831e6e879df08d165b7e3debab44faf1b3cea06dc9c2dddd3642146a3e2cfff603fb266293e6d881c599fe903edb325627b1886595dd9ddeebf5f15a18 SHA512 c299afba91091a0233e866e57c10cc87800c3ea1892809250c84b4d2322d01e2ce73d00c11330f2cc6a5ff6fc10f23672fc87a45e0f7fdd8e2aea9770c858f9a
+DIST imlib2_loaders-1.7.5.tar.xz 252548 BLAKE2B 5bc048dad9949dabd9ba3253fe862089975fe0b1dc6bc898e0b5fbc27cf4c2d7be81dbec64aa9fc1da357ed881e5617017f36c46d009a633e594a54fa29beeb0 SHA512 3b307dfae033466d2fa37f90d47626d32fd90228747cbd03ca3bfafe33fb995dbd1b86cfd13e4982c622b18940e4d6b2ec4826c017f5dce0c1cdee1b558c9204
+EBUILD imlib2_loaders-1.7.1.ebuild 892 BLAKE2B 66239f83c107d5f0d170cc0493b792e7c54746e0f5f2c4140f1f6e8a15b98e33ccd9a74ae09ec5df583bc49fee0da98da5b571e5ac2aab474ada010abc603f40 SHA512 24648e494b9b8ac9bf7ede618bcc37db544a0d0802c830b82e6621eea463cfefbace6d13a5c3158970d733f34655494962ad116d90dba0b9031f8c3f0ba54afc
+EBUILD imlib2_loaders-1.7.5.ebuild 792 BLAKE2B becd5eafbc9fa80f7c3795382502d34da8fe01a1e06ae561eab073baaec69b8bea68703393bf069438458482cf72fbc36e3c703e819fabcc8ac3731c43c448db SHA512 cfcc85729ea7b60ea110bba30fef86826f42abc2d2b77ecf65005d16fc70c864ae3281bf8ac4d4b684c0745d07cd59d28225de692c7e3284584410b5a7b3c2b1
 MISC metadata.xml 831 BLAKE2B 768ef455b15927c99ebe946766f22206f4fa35a8a47bcadf5677f8daddaee6eb1997e01ebcbfaa7efa3fb9d82136044b5bce2d323731960e93cfafb52700f542 SHA512 c840959ac48981bb888b2cc00789be2d62d5695bd45fcaedd89b6f92a617d18bcc34f15fa3b763657359ef4c0adefd50fd708d6766ad546fc54fcd81e2bf9d2a
diff --git a/media-plugins/imlib2_loaders/imlib2_loaders-1.7.1.ebuild b/media-plugins/imlib2_loaders/imlib2_loaders-1.7.1.ebuild
index 06e19e93bd38..c80e42eab44d 100644
--- a/media-plugins/imlib2_loaders/imlib2_loaders-1.7.1.ebuild
+++ b/media-plugins/imlib2_loaders/imlib2_loaders-1.7.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.bz2"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
 IUSE="eet xcf"
 
 RDEPEND=">=media-libs/imlib2-${PV}
diff --git a/media-plugins/imlib2_loaders/imlib2_loaders-1.6.1.ebuild b/media-plugins/imlib2_loaders/imlib2_loaders-1.7.5.ebuild
index 8243af8e60c8..3662847731b7 100644
--- a/media-plugins/imlib2_loaders/imlib2_loaders-1.6.1.ebuild
+++ b/media-plugins/imlib2_loaders/imlib2_loaders-1.7.5.ebuild
@@ -1,27 +1,25 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Additional image loaders for Imlib2"
 HOMEPAGE="https://www.enlightenment.org/
 	https://sourceforge.net/projects/enlightenment/files/imlib2-src/"
-SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.xz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
-IUSE="eet xcf"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+IUSE="xcf"
 
-RDEPEND=">=media-libs/imlib2-${PV}
-	eet? ( dev-libs/efl[eet] )"
+RDEPEND=">=media-libs/imlib2-${PV}"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	local myconf=(
 		--disable-static
-		$(use_enable eet)
 		$(use_enable xcf)
 	)
 
diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest
index 6479baa4370f..7da6ef350efe 100644
--- a/media-plugins/live/Manifest
+++ b/media-plugins/live/Manifest
@@ -2,5 +2,5 @@ AUX config.gentoo-so-r3 539 BLAKE2B e80c461f69a991641100d3966d1d100dc7fe8c15e3ed
 DIST live.2021.05.22.tar.gz 682749 BLAKE2B 38663f8c5dbd8cccf4e5cfe685b0eb393559195eba852fcdf6c38c7be936948d2727da91e829aedbde08eab6edb6082533d14061edfcf125d82c925bffdb9f90 SHA512 4021cbdaffb48b9b361e931fa71f89db1e116fe8c4e57df78d54493b111a8c6249431cc418a20352a45a75ef240712609eed3aa7468c6049996dd2451ae2941c
 DIST live.2021.08.24.tar.gz 683337 BLAKE2B fabc24498cc5b23b43f11303598b770a84036d0f835a04284bc9fc4f2525d39f4e846e8eb16f724136f9b0caad20cb3dc55b14218fc0ec764822fa22a018642d SHA512 f776e43a9b0792fd41e43f3c06e48f5d766c405d6af4ed5ddac108723f222c844ec5dbe29701b62dff760fbed777935ffc9149080b45d7a7b4c655a7f1fe6dae
 EBUILD live-2021.05.22.ebuild 3109 BLAKE2B af54967cdf34cfeb6b7f175902a69aac1d3b01dad02e3e90c7da47dd170a7c363270e1bdb90ee2d1d297726fcf4cbbc9e7e52c395c2a4d8b62af652f359525e1 SHA512 5ec35a0d90bec902ba75a4398189100b04b482c864707fa01be6259046a58eaa1d4055717080edcf109967dcd81dbba6a1f7ffeee138e158b23bb62e64b1a588
-EBUILD live-2021.08.24.ebuild 3115 BLAKE2B 88373da81a2c9fa24c646e76c38dba0c3e9f5626c1977ccf31cc4c5ad3ddbb8cdb079de265d8e4e052e47da181916e1bf889d0610bad13ddb3f764c7b34275c0 SHA512 53c2d9cd6c1b60e29b5e6f5cd6f4a4d1865c8f2c54cb9f46db4407d741ec7a6124dc7331a75d50b956182f2d38c9c794f988489120077acef96215e541ca1a83
+EBUILD live-2021.08.24.ebuild 3109 BLAKE2B 0c76b0475697398a4ba34d4ea4db09062df9db0ab1ff0dbf492c28c8d84262bcc3045c2b01faacc6e80cc59c51eb53dffd23d5d0f3b5657a50ae2c914fd3a3ae SHA512 143402b505d810b04263978a8a68b2f8591c2aa74177f8b843a0cca42bac43c4eaaec39f1b7a6595efa879d969c6c1b1ce6dc1edb7d33970142748464540ea6a
 MISC metadata.xml 222 BLAKE2B 96fcf0d83a18e2c1f4611d550e7e2123a06fe8b3b2890cb5757284d8fc7d3bebdf1aeb4f82affbc7c51268749cac9fdcbf43888e3bec0e68e1b6548a3f6eca76 SHA512 c3657a6bf2503e6585ee53453bf0ba26b5eed2e894342087358b5f4306a960db915de61036b6c8dc57cdb7a7f3326d57ff3badf7b3ecefaa99291289a73997de
diff --git a/media-plugins/live/live-2021.08.24.ebuild b/media-plugins/live/live-2021.08.24.ebuild
index 24964a3eab89..d00a4cc4c636 100644
--- a/media-plugins/live/live-2021.08.24.ebuild
+++ b/media-plugins/live/live-2021.08.24.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.live555.com/"
 SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="ssl"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-plugins/vdr-osdteletext/Manifest b/media-plugins/vdr-osdteletext/Manifest
index dbbd884f0efe..a01576020b31 100644
--- a/media-plugins/vdr-osdteletext/Manifest
+++ b/media-plugins/vdr-osdteletext/Manifest
@@ -1,16 +1,8 @@
 AUX confd 963 BLAKE2B 24697ddc9bea54bf7969541ac8b980e76e65f66b37b0bfb0b6bc7bcb8dd03d568aceb0270da20347b66a513080de894fb46c27c38f2eb165fe25dff05e70249a SHA512 1b46b07e67c345e6d00bab485438f4f387cff4d09d8e77f006ce19825f953bee96193cbf1cbb7ad5c6a34f24aac20492b00e3d59fcff3554ea709656bb6fb589
-AUX confd-v2 963 BLAKE2B 7189cc8575586225b424a0bc513cb4c47031f68691c8816cac64efa5c7e37f9106e32e8f80d89f8d45966d02668286b45dcfe57d302d31ed464256326255343f SHA512 9690245ea6e822c4bec6bf6b9223cf162b3ac1b3fb742de1488c74bfd287698a6d67622951d69ee0ede515e17a727a077ecf6f0eba9c3e46e9393309925484c6
-AUX rc-addon-v3.sh 1228 BLAKE2B 105480d839ac3aafb427b10561131bf0c5a19244cfac1a9872cd9dacc60d6b4db6453f627431ce3ea4ca4c047e772e17959f8463872152df0a30ddefdb6d7712 SHA512 ec139bda35653a186071a6199bf70ed5c667a6c6d76bf2e16ce142dc577eb3b8b3da8f716f06d2334af0bfed56fb27087d5b44752b19c4e2bc698cbab26c54f7
 AUX rc-addon.sh 1191 BLAKE2B d85ac441b2899b48188bbaa8c021c6ce858a5e93f29b947640684123279908a5707006408080f412140866c1cf06941c3457beba8dbb259b0c706daa60b8dd9b SHA512 674183c146887a2414132b5b30c8262a6ab05009256fec5bbe1e4b588b6fbceb1fd8a4a5a0f6e61346a5345a3a01cfb2cbcd987206ccee9defbb4c923b4ada59
 AUX vdr-osdteletext.sudo 41 BLAKE2B 0667dd49014acdd7ebcd30fed09020dd72d96f1721c7482ee227ce8609456831c75dd7cd7e4791057daad13ae56712dff9e5e382ef36f7e08a8043c64048dad6 SHA512 bf67c332d86cc4d85c6e67a7d9d4fe8271dec1ca3a319bcb22c234278545120de99a97409c19c7f5e37d1f87e97a09306688ce868f385b502305c730bfa0263f
-DIST vdr-osdteletext-0.9.7.tgz 101400 BLAKE2B 52cabda446701ce4898705487e47e5ca5146e58b42b47814f3835326c72118c62212ab81cad036f147e23b0c330b08bd2b2ba82bb7cc41f1bfcbd2525dbfe179 SHA512 d7ebd74ba5411bc8c7596b4f5f30eba7bc71e09d137a10650e78761c58045a96f804468f87fbf0c27e8fa161b64b06035878e5fac9940f75ea728646e92e6c76
 DIST vdr-osdteletext-0.9.8.tar.gz 100954 BLAKE2B def803093a3726a7c9b1905e04e5790ad3959d8d66664ccc3b0147cf4ed5ff37389525cbc1504fed7e8da782c5c9e58128e35c6adaa1f4ab04ad15cc3e2ae8ba SHA512 48196382fba247ac3d0140d028e23a3474e9a3b440c33b7a27e6127abfa949b1a7ab6748416d3430b68a80830bfbff1831de9d7e902ff9701b9dfd2d873a1f58
-DIST vdr-osdteletext-1.1.1.tar.gz 111113 BLAKE2B 5f9f44ad0615877896a9080f1b32fe4e2c6cd1916dcf6ad50c32bc22ac0cec22f44339ad2d4df7ac3135c1533bde039d0497bc5d7dc365c8b869900d8a9191db SHA512 a4f7e5bd8845917868dcb2041dbb679884595611db796cf5a58d05e41a96efcf47f3fbb92314c58f1f3d9af656d6ab5ef985f3867ea8bd45dd1c0c6e7c745a3a
-DIST vdr-osdteletext-2.1.1.tar.gz 123531 BLAKE2B a8a294b9406d7fe52da2fda0da4d59a4bff7392d9d05fd5c5856fd40c875004280abcb255ca47fd0fb84c45c8fc285992d18c41f9b668be746e3b728066ac70e SHA512 53edeaecf79d5008d13e3c621126494967c333a38ab51c1941cee5dd3ce2bcf1c6d4e1bbb8220657b9ad7972170724d956025d72728b4153d4d45d5998829001
 DIST vdr-osdteletext-2.2.1.tar.gz 130325 BLAKE2B 8bfac7246a555d6b238db7123332b6d50f27444f00ca3ff54b8b86e35f05171f227ded266307f8a38e36046ef3b1bf725f12af5ef6fec64628775d690d0bad93 SHA512 519c716d794eb9d6cd6e86eb538abe759c89c902ef49baf34586f38757f67239253fe19dc87062c5e13983ef9ddcf663844f165dd493cd41b890e62a1ef37810
-EBUILD vdr-osdteletext-0.9.7.ebuild 1206 BLAKE2B 26d9c561a70002d6531181fc039203d8f7292fd23966f42f1d4080948d04c168d3c91df83454473ff13e8179a3c6ae21b8988cebd633723280a2635f9d119e51 SHA512 6b06ee1321f69fadb3eb9a1fd3af39c7942f85f35ce19ccac8ffb0aa45e9353a608d0f4fa4acdc75e367e5341262a4f9e13922d6a027b9f62b1b9a9d0a6e2644
 EBUILD vdr-osdteletext-0.9.8.ebuild 1232 BLAKE2B dc12f1752e8e66001fe7c5a2d7605b37983f121f5fd50218a268ee807c3b0ced95b2c0e63112a56bc6d191dbe1940d6ad806b1da45607f845317a482684c210f SHA512 9de8ac1f54cb0cce110094e658b8a21bb8d5ef6e76d5930059659743da942afc75b0e0538e0c2f954927ca140db8f36a07e0d8e092b3c8d7294149b7b6ce3401
-EBUILD vdr-osdteletext-1.1.1.ebuild 1232 BLAKE2B dc12f1752e8e66001fe7c5a2d7605b37983f121f5fd50218a268ee807c3b0ced95b2c0e63112a56bc6d191dbe1940d6ad806b1da45607f845317a482684c210f SHA512 9de8ac1f54cb0cce110094e658b8a21bb8d5ef6e76d5930059659743da942afc75b0e0538e0c2f954927ca140db8f36a07e0d8e092b3c8d7294149b7b6ce3401
-EBUILD vdr-osdteletext-2.1.1.ebuild 1232 BLAKE2B dc12f1752e8e66001fe7c5a2d7605b37983f121f5fd50218a268ee807c3b0ced95b2c0e63112a56bc6d191dbe1940d6ad806b1da45607f845317a482684c210f SHA512 9de8ac1f54cb0cce110094e658b8a21bb8d5ef6e76d5930059659743da942afc75b0e0538e0c2f954927ca140db8f36a07e0d8e092b3c8d7294149b7b6ce3401
-EBUILD vdr-osdteletext-2.2.1.ebuild 1217 BLAKE2B 020ffc3d38cdc47eb7a29b55ab7d41d00b7adf31df3f8c7b28ae5e00d6577eab5fe3cf47386f28e0e03ab8c914a2e87c2a30d942065356be1f347e8bf08ffbcd SHA512 2b66f495eb52336c9526c2e5b997bbe9d4c5302a22589439722809735395e768fb0be7ed90346fcb92abee3a8707ef1eddbde0058d0dd87780a8f6a8a48676cf
+EBUILD vdr-osdteletext-2.2.1.ebuild 1215 BLAKE2B 9d52fa8b0db12dff84c4ba421d67b026ddde788becfb4b7cb0aeaea9159c091b71ce68de70346cd4a5048e54c20fcf45eb0d7bfcbc3cd198fea3822b03cd714d SHA512 7d531da19ed5872be9a8967c801b7c748b67d80d56d9a28a8aac299fdf73a28aeef5b6d1929efb00836abf09df8ec737404f687f0a1c942fdfa35977e3d6e325
 MISC metadata.xml 508 BLAKE2B 0e1fd077065c9e960657a6a6b2648f77a96cf106c57732b31c65050d3e85cdb35f3f735944bfc423f79be8382f5f210dcc7acfe04cdc10b294400f579cda251d SHA512 9409dce6ee81e8d7a7541528880eca2b38ba500cfc38a8c2d0eb0636c54ab5b5cb2987befa9f420fbb28b391b0516299ccc02b25b60137bef024cf2e70ee15a3
diff --git a/media-plugins/vdr-osdteletext/files/confd-v2 b/media-plugins/vdr-osdteletext/files/confd-v2
deleted file mode 100644
index 1cfe42c11bc0..000000000000
--- a/media-plugins/vdr-osdteletext/files/confd-v2
+++ /dev/null
@@ -1,37 +0,0 @@
-# /etc/conf.d/vdr.osdteletext
-
-# ################################################
-#
-# for minimal activity on your Harddisc
-# store the vtx files in a temp filesystem
-#	allowed values: yes no
-#	default: yes
-#OSDTELETEXT_TMPFS=yes
-
-
-# #########  Expert Functions  ###################
-#
-# set the size of the videotext store
-# (when using TMPFS this is taken from RAM)
-# 	allowed values: size in megabyte
-#	default: 20	# used 20 Mb for videotext
-#OSDTELETEXT_SIZE=20
-
-# set the dir of the tmpfs
-#	allowed values: directory names
-#	default: /var/cache/vdr/osdteletext
-#OSDTELETEXT_DIR=/var/cache/vdr/osdteletext
-
-# store top text pages at cache. (unviewable pages)
-#	allowed values: yes no
-#	default: no
-#OSDTELETEXT_STORETOPTEXT=no
-
-# ########  NOTE! ################################
-#
-# User with an old install have an entry like
-#
-# tmpfs          /vtx        tmpfs       size=20M        0 0
-#
-# in the /etc/fstab
-# you can remove the entry, not needed anymore.
diff --git a/media-plugins/vdr-osdteletext/files/rc-addon-v3.sh b/media-plugins/vdr-osdteletext/files/rc-addon-v3.sh
deleted file mode 100644
index 3dde26bec61c..000000000000
--- a/media-plugins/vdr-osdteletext/files/rc-addon-v3.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# rc-addon-script for plugin osdteletext
-#
-# Joerg Bornkessel <hd_brummy@gentoo.org>
-# Matthias Schwarzott <zzam@gentoo.org>
-
-: ${OSDTELETEXT_TMPFS:=yes}
-: ${OSDTELETEXT_SIZE:=20}
-: ${OSDTELETEXT_DIR:=/var/cache/vdr/osdteletext}
-: ${OSDTELETEXT_STORETOPTEXT:=no}
-
-# depends on QA, create paths in /var/cache on the fly at runtime as needed
-init_cache_dir() {
-	if [ ! -d "${OSDTELETEXT_DIR}" ]; then
-		mkdir -p ${OSDTELETEXT_DIR}
-		chown vdr:vdr ${OSDTELETEXT_DIR}
-	fi
-}
-
-plugin_pre_vdr_start() {
-	init_cache_dir
-
-	add_plugin_param "-d ${OSDTELETEXT_DIR}"
-	add_plugin_param "-n ${OSDTELETEXT_SIZE}"
-
-	if [ "${OSDTELETEXT_STORETOPTEXT}" = "yes" ]; then
-		add_plugin_param "-t"
-	fi
-
-	if [ "${OSDTELETEXT_TMPFS}" = "yes" ]; then
-		## test on mountet TMPFS
-		if /bin/mount | /bin/grep -q ${OSDTELETEXT_DIR} ; then
-			:
-		else
-			einfo_level2 mounting videotext dir ${OSDTELETEXT_DIR}
-			sudo /bin/mount -t tmpfs -o size=${OSDTELETEXT_SIZE}m,uid=vdr,gid=vdr tmpfs ${OSDTELETEXT_DIR}
-		fi
-	fi
-}
-
-plugin_post_vdr_stop() {
-	if [ "${OSDTELETEXT_TMPFS}" = "yes" ]; then
-		if /bin/mount | /bin/grep -q ${OSDTELETEXT_DIR} ; then
-			einfo_level2 unmounting videotext dir ${OSDTELETEXT_DIR}
-			sudo /bin/umount ${OSDTELETEXT_DIR}
-		fi
-	fi
-}
diff --git a/media-plugins/vdr-osdteletext/vdr-osdteletext-0.9.7.ebuild b/media-plugins/vdr-osdteletext/vdr-osdteletext-0.9.7.ebuild
deleted file mode 100644
index ea64297123b5..000000000000
--- a/media-plugins/vdr-osdteletext/vdr-osdteletext-0.9.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vdr-plugin-2
-
-VERSION="2161" # every bump, new version
-
-DESCRIPTION="VDR Plugin: Osd-Teletext displays the teletext on the OSD"
-HOMEPAGE="https://projects.vdr-developer.org/projects/plg-osdteletext"
-SRC_URI="https://projects.vdr-developer.org/attachments/download/${VERSION}/${P}.tgz"
-
-LICENSE="GPL-2+ public-domain" #teletext2.ttf, not copyrightable
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="media-video/vdr"
-RDEPEND="${DEPEND}"
-
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon-v3.sh"
-VDR_CONFD_FILE="${FILESDIR}/confd-v2"
-
-QA_FLAGS_IGNORED="
-	usr/lib/vdr/plugins/libvdr-.*
-	usr/lib64/vdr/plugins/libvdr-.*"
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	insinto /etc/sudoers.d
-	insopts -m440
-	newins "${FILESDIR}/vdr-osdteletext.sudo" vdr-osdteletext
-
-	local vdr_user_home="/var/vdr"
-	insinto "${vdr_user_home}/.local/share/fonts/"
-	insopts -m444
-	doins teletext2.ttf
-	fowners -R vdr:vdr "${vdr_user_home}/.local"
-}
-
-pkg_postinst() {
-	elog "This ebuild has installed a special teletext font"
-	elog "named \"teletext2\""
-	elog "You may go to the plugin's setup menu and select"
-	elog "the font."
-}
diff --git a/media-plugins/vdr-osdteletext/vdr-osdteletext-1.1.1.ebuild b/media-plugins/vdr-osdteletext/vdr-osdteletext-1.1.1.ebuild
deleted file mode 100644
index ca437a9ac7bd..000000000000
--- a/media-plugins/vdr-osdteletext/vdr-osdteletext-1.1.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user-info vdr-plugin-2
-
-MY_P="vdr-plugin-osdteletext-${PV}"
-
-DESCRIPTION="VDR Plugin: Osd-Teletext displays the teletext/videotext on the OSD"
-HOMEPAGE="https://projects.vdr-developer.org/projects/plg-osdteletext https://github.com/vdr-projects/vdr-plugin-osdteletext/"
-SRC_URI="https://github.com/vdr-projects/vdr-plugin-osdteletext/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ public-domain" #teletext2.ttf, not copyrightable
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="media-video/vdr"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-QA_FLAGS_IGNORED="
-	usr/lib/vdr/plugins/libvdr-.*
-	usr/lib64/vdr/plugins/libvdr-.*"
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	insinto /etc/sudoers.d
-	insopts -m440
-	newins "${FILESDIR}/vdr-osdteletext.sudo" vdr-osdteletext
-
-	local vdr_user_home=$(egethome vdr)
-	insinto "${vdr_user_home}/.local/share/fonts/"
-	insopts -m444
-	doins teletext2.ttf
-	fowners -R vdr:vdr "${vdr_user_home}/.local"
-}
-
-pkg_postinst() {
-	elog "This ebuild has installed a special teletext font"
-	elog "named \"teletext2\""
-	elog "You may go to the plugin's setup menu and select"
-	elog "the font."
-}
diff --git a/media-plugins/vdr-osdteletext/vdr-osdteletext-2.1.1.ebuild b/media-plugins/vdr-osdteletext/vdr-osdteletext-2.1.1.ebuild
deleted file mode 100644
index ca437a9ac7bd..000000000000
--- a/media-plugins/vdr-osdteletext/vdr-osdteletext-2.1.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user-info vdr-plugin-2
-
-MY_P="vdr-plugin-osdteletext-${PV}"
-
-DESCRIPTION="VDR Plugin: Osd-Teletext displays the teletext/videotext on the OSD"
-HOMEPAGE="https://projects.vdr-developer.org/projects/plg-osdteletext https://github.com/vdr-projects/vdr-plugin-osdteletext/"
-SRC_URI="https://github.com/vdr-projects/vdr-plugin-osdteletext/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ public-domain" #teletext2.ttf, not copyrightable
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="media-video/vdr"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-QA_FLAGS_IGNORED="
-	usr/lib/vdr/plugins/libvdr-.*
-	usr/lib64/vdr/plugins/libvdr-.*"
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	insinto /etc/sudoers.d
-	insopts -m440
-	newins "${FILESDIR}/vdr-osdteletext.sudo" vdr-osdteletext
-
-	local vdr_user_home=$(egethome vdr)
-	insinto "${vdr_user_home}/.local/share/fonts/"
-	insopts -m444
-	doins teletext2.ttf
-	fowners -R vdr:vdr "${vdr_user_home}/.local"
-}
-
-pkg_postinst() {
-	elog "This ebuild has installed a special teletext font"
-	elog "named \"teletext2\""
-	elog "You may go to the plugin's setup menu and select"
-	elog "the font."
-}
diff --git a/media-plugins/vdr-osdteletext/vdr-osdteletext-2.2.1.ebuild b/media-plugins/vdr-osdteletext/vdr-osdteletext-2.2.1.ebuild
index c3c5b5559223..0d7258896b07 100644
--- a/media-plugins/vdr-osdteletext/vdr-osdteletext-2.2.1.ebuild
+++ b/media-plugins/vdr-osdteletext/vdr-osdteletext-2.2.1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/vdr-plugin-osdteletext-${PV}"
 
 LICENSE="GPL-2+ public-domain" #teletext2.ttf, not copyrightable
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="media-video/vdr"
 RDEPEND="${DEPEND}"