gentoo auto-resync : 09:09:2022 - 10:40:04

26 files changed, 514 insertions, 204 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 848b12f691b2..96008084b113 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest
index 824321eda74f..8fde118a49cb 100644
--- a/media-libs/libcaca/Manifest
+++ b/media-libs/libcaca/Manifest
@@ -8,4 +8,5 @@ AUX fix-css-path.patch 502 BLAKE2B c494c458524f98017dceb41266ed051cb3bc9f00c5718
 AUX libcaca-0.99_beta18-fix-tests.patch 1886 BLAKE2B 8961c617ae568ab19b0404a8ddb1e4da743f7792b36fd32ace460071c04754f8e5845200333f96e4b9602f547d3249da301c3df62cee7bb20235da6a3242789f SHA512 583b440f93d2d468b14a707946eda928811b8c6573b1a48a1f6010d2f3713399689434531b0068ebbc1999dc82867c7ae6da0bdea9fb754277eda484fe39b1f6
 DIST libcaca-0.99.beta19.tar.gz 1203495 BLAKE2B 65462090fc503d640d91753ff21b55ad1bac360fb6e5aae8f46d8162e62f8834f791a1db6e2045a63deaa7c409c3455b484750294cfb01e1027f0ca8dc2f2798 SHA512 780fc7684d40207cc10df3f87d6d8f1d47ddfffa0e76e41a5ce671b82d5c7f090facb054c3d49ca7c4ea1a619625bb9085ce52f837f50792b4a2d776a4c68e15
 EBUILD libcaca-0.99_beta19-r8.ebuild 4490 BLAKE2B 2e53735e7b60e1f8224217724cbaf1f019329ec374520c915b4c0a73d9066c241e4ab21a2f9e144c4d26fda5bf4da4e9e84cecd8b43dca2883b77a9128f5dac2 SHA512 42f35bb2b657d16eabf6afe1a6323ae892edae5bd6bc87f8ec17647751831a7d9f6ec2c6ddfabcede558b22b21cb93a33ec17504a7e3a0864b6a7c0f0fef04cf
+EBUILD libcaca-0.99_beta19-r9.ebuild 3483 BLAKE2B ced6183a13552d60ce2cff2c373ea68cb930ee6939b1badea08849a504cf69107c2803e91c7428e1297d52261d7b20dd26b78c22e17aad76eccab1f918f3e4ab SHA512 e6e226f5fc47fc5886e2392f703e81c25c2ac80dea2528d752636f4b9bde30730f549d247249cb9f4a836c37223020ed4ce05fbe506d449b0830f9193a9b30ac
 MISC metadata.xml 305 BLAKE2B 09d0fd38e248eee6d78d5cfc6d04cd454ba1b9c9b3474e1f94de41d0dff53e67f425875a9b27f9247ace85580025197e12c379ccec928474954bc3bd2ef0307d SHA512 6b8addbc26d79c54322fe838afaaf08ee7c73a8d1c7ecf529778e63490117e20ad744277506fea52b8ed6ba7652c7d75c7344642ad6521ad17b85c68d0a69713
diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r9.ebuild b/media-libs/libcaca/libcaca-0.99_beta19-r9.ebuild
new file mode 100644
index 000000000000..29de0d6f6dee
--- /dev/null
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r9.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+RUBY_OPTIONAL=yes
+
+inherit autotools ruby-ng flag-o-matic toolchain-funcs multilib-minimal
+
+MY_P=${P/_/.}
+DESCRIPTION="A library that creates colored ASCII-art graphics"
+HOMEPAGE="http://libcaca.zoy.org/"
+SRC_URI="http://libcaca.zoy.org/files/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/all/${MY_P}"
+
+LICENSE="GPL-2 ISC LGPL-2.1 WTFPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="doc imlib ncurses opengl ruby slang static-libs test truetype X"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE=""
+
+DEPEND="
+	imlib? ( >=media-libs/imlib2-1.4.6-r2[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
+	opengl? (
+		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+		>=media-libs/freeglut-2.8.1[${MULTILIB_USEDEP}]
+		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
+	)
+	slang? ( >=sys-libs/slang-2.2.4-r1 )
+	X? (
+		>=x11-libs/libX11-1.6.2
+		>=x11-libs/libXt-1.1.4
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		virtual/latex-base
+		>=dev-texlive/texlive-fontsrecommended-2012
+		>=dev-texlive/texlive-latexextra-2012
+		dev-texlive/texlive-latexrecommended
+	)
+	test? ( dev-util/cppunit )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS NOTES README THANKS )
+
+PATCHES=(
+	# Fix out of source tests
+	"${FILESDIR}"/${PN}-0.99_beta18-fix-tests.patch
+	# Debian patches
+	"${FILESDIR}/CVE-2018-20544.patch"
+	"${FILESDIR}/CVE-2018-20545+20547+20549.patch"
+	"${FILESDIR}/CVE-2018-20546+20547.patch"
+	"${FILESDIR}/canvas-fix-an-integer-overflow-in-caca_resize.patch"
+	"${FILESDIR}/Fix-a-problem-in-the-caca_resize-overflow-detection-.patch"
+	"${FILESDIR}/100_doxygen.diff"
+	# Fix doxygen docs install, bug 543870
+	"${FILESDIR}/fix-css-path.patch"
+)
+
+pkg_setup() {
+	use ruby && ruby-ng_pkg_setup
+}
+
+src_prepare() {
+	# bug #339962
+	sed -i -e '/doxygen_tests = check-doxygen/d' test/Makefile.am || die
+
+	sed -i \
+		-e 's:-g -O2 -fno-strength-reduce -fomit-frame-pointer::' \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		configure.ac || die
+
+	if ! use truetype; then
+		sed -i -e '/PKG_CHECK_MODULES/s:ftgl:dIsAbLe&:' configure.ac || die
+	fi
+
+	if use imlib && ! use X; then
+		append-cflags -DX_DISPLAY_MISSING
+	fi
+
+	# bug #653400
+	append-cxxflags -std=c++11
+
+	# bug #601902
+	append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
+
+	# fix docs install path, bug 543870#c14
+	sed -i "s/libcaca-dev/${PF}/g" doc/Makefile.am || die
+
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	if multilib_is_native_abi; then
+		# bug #44128
+		export VARTEXFONTS="${T}/fonts"
+
+		# bug #329651
+		use ruby && use ruby_targets_${USE_RUBY} && export RUBY=$(ruby_implementation_command ${USE_RUBY})
+	fi
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(multilib_native_use_enable slang)
+		$(multilib_native_use_enable ncurses)
+		$(multilib_native_use_enable X x11)
+		$(multilib_native_use_with X x)
+		--x-libraries=/usr/$(get_libdir)
+		$(use_enable opengl gl)
+		--enable-cxx
+		$(use_enable imlib imlib2)
+		$(use_enable test cppunit)
+		--disable-java
+		$(multilib_native_use_enable ruby)
+		--disable-python
+		--disable-csharp
+		$(multilib_native_use_enable doc)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake V=1
+}
+
+multilib_src_test() {
+	emake V=1 -j1 check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libcuefile/Manifest b/media-libs/libcuefile/Manifest
index 4689f9c7ce05..d3a0f9b5bd88 100644
--- a/media-libs/libcuefile/Manifest
+++ b/media-libs/libcuefile/Manifest
@@ -1,4 +1,4 @@
 AUX libcuefile-static-libs.patch 1299 BLAKE2B 488f99588881a9b24471b1a4c02b090147125ebe4fc2865ce2bca5e03891d6ea46530a9c265df77c5663e4f99d0a841844c0ccc3c918fc36bfc973fa8bda5fe1 SHA512 efe0d8d04acbb73e666411780283e35567b87233c70c8383404965f1dc6fceed7e1b28ce5f77d8085821df70062eaa153161cd5212dd18246920d2dff2699c94
 DIST libcuefile-477.tar.xz 41676 BLAKE2B 01232ed507386809cd7960f06251139fd5c11a251f68e59513b6b5e482b9b7977e5d3fd8d6147a47e4a74b8e5e320019383a4d69c6c3395ead3cee0d8c5c3b43 SHA512 9cf46f9fd1b178758b2d15fa65d67d069bba41a83354a5aedf7b57ed5752bb68ad1d10208ffbb22f2aac7bd5d938e9395f67d4248441743d45e0099638d60d5e
-EBUILD libcuefile-477-r1.ebuild 713 BLAKE2B 0a28a617f432e0e10f9dd02e56ad1df0f3513f1ac41aeaa81e93d3d9394f78e89629cb05bcbb73950814a236d8ef08911b9e1f19eeb8791c7c5c4769f687656d SHA512 a36d26af171304d9f031b74cea95c311bd270e8f33146ece6364a52c381cae408f1043db284aa6d7ee0eed33b495f49caf4952572b1b86bc14648328dbc35211
+EBUILD libcuefile-477-r2.ebuild 696 BLAKE2B 8b720f6660fa77fcf36354494da4bd5c724fa26f10a52a7609626b34a9d9ffbd6400e5909b52055f9d62f02fbe0ada0345b5ac34692a09ecb8ba90cdb7a30773 SHA512 a715170f762308d0be7a92269af87de9ccac0f4e93bb74dfaf0f26bcee7c3661029bfe4a315fce8dca10789eeab1b46d3bbfa24ade230598cedd48ec9ce25d03
 MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/media-libs/libcuefile/libcuefile-477-r1.ebuild b/media-libs/libcuefile/libcuefile-477-r2.ebuild
index 39c396d77a76..a083d0decc2d 100644
--- a/media-libs/libcuefile/libcuefile-477-r1.ebuild
+++ b/media-libs/libcuefile/libcuefile-477-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake-multilib
+inherit cmake
 
 # svn export http://svn.musepack.net/libcuefile/trunk libcuefile-${PV}
 # tar -cJf libcuefile-${PV}.tar.xz libcuefile-${PV}
@@ -19,7 +19,8 @@ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64
 PATCHES=( "${FILESDIR}"/${PN}-static-libs.patch )
 
 src_install() {
-	cmake-multilib_src_install
+	cmake_src_install
+
 	insinto /usr/include
 	doins -r include/cuetools
 }
diff --git a/media-libs/libfame/Manifest b/media-libs/libfame/Manifest
index 650dd26f8c32..f9da7a0e3f92 100644
--- a/media-libs/libfame/Manifest
+++ b/media-libs/libfame/Manifest
@@ -2,5 +2,5 @@ AUX libfame-0.9.1-gcc43.patch 1190 BLAKE2B 7f99db82fe87c5f024ae68b7ddb68124cdf5a
 AUX libfame-0.9.1-mmx-configure.ac.patch 1003 BLAKE2B a775cdac594a6b30b78cbaee88f69b502a08d46b462f0d16206e878d836cef89f7bfba260a468600ffc36506a22630c5910822c7d9f11c074cc6a8119a436d2e SHA512 9632ad664682bf420eb4b30c25f4979215e172aaa81fe7ad09b714b36edf124bb3c60d56f63e55267345bd8be52b0ea35f40ce54421d1fc58ca8542915180db2
 DIST libfame-0.9.1.tar.gz 296837 BLAKE2B 2c3b2b1c90baa2363ea17ab308070e130a15e2f58efcf00166e724dcf55175179012ffa9874dfce7c9179dec01e0c63ccb0b051d744a326636acf70e796f2483 SHA512 511e7be0bac81482edbe5357b982ad1f4adf2bc784a9f52a3f095269076cd1e42866d2ae24a31b17c38acefc03e2c9d868b17074931e5d320ab5eb52271c4345
 DIST libfame-patches-2.tar.bz2 5324 BLAKE2B 03768badf8a3b0cc5546fed200fa71850c1151223b6b0e2301b56f396e9a71ec495ab2bfbb1ab5bd2c3fbc6f4813928786edfae8876e15c4f742bb09162a85ca SHA512 e4f67b137c3397dd00f8a4d5835a180963c3109c0d239d8f0fe616983a5187f6eaad9f4097cc9eaceb5b9c42de9d9e7518a4174247665a8203a4f69b3383abc4
-EBUILD libfame-0.9.1-r3.ebuild 1034 BLAKE2B 52b6b037f3dac484e97963551ea8418a7b388b8a634e3b68424d5c17d45bb656c7e14bdc668ad8013271a1682f5b7cb0fc0ffd761a2a53f7d5841d4e5eec1b2b SHA512 3e34c6f733498384c069a8bc6ee207a763af2aa77744280c4bf755dc1c7caadd0403ae366105f4645330ac4f64b2f28b7b60e43d021b61715a039488aed4af58
+EBUILD libfame-0.9.1-r4.ebuild 955 BLAKE2B 082ccc7fc619238535b20d90980eddb30077533b4af28c26d1a2392127d5b20af41700fd7dfe3283348ec1fbf3fe2595ed30003255b0473cf5b51e18dbd180f1 SHA512 ffba0c907d06c63df5abbc5c0db1d16fae926dd271cb48949a19698cb6fe01feaf276002f87fae0ac9d2d4c4a123641dcb80a539755fbe75bd0c49bff55b73ef
 MISC metadata.xml 298 BLAKE2B c528af5162131ff5458b9c14c2c726b11534e7bb163f3cff9e532ea0ad8b4cf5f5eca260a11880d253b8f1aa4ed84de9400359fcc3f09232a28c9b5710b983fe SHA512 cdf6884bd60e68ee6af2ec652f7955a39700bc314bf605af92e7fe171ccfac381c50b91d06b4f19dd2707e01c05652f473ae099438f852ba0556f182acaa5dd3
diff --git a/media-libs/libfame/libfame-0.9.1-r3.ebuild b/media-libs/libfame/libfame-0.9.1-r4.ebuild
index d8afa4ffd3a4..69b4bfe45f41 100644
--- a/media-libs/libfame/libfame-0.9.1-r3.ebuild
+++ b/media-libs/libfame/libfame-0.9.1-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools multilib-minimal
+inherit autotools
 
 DESCRIPTION="MPEG-1 and MPEG-4 video encoding library"
 HOMEPAGE="http://fame.sourceforge.net/"
@@ -33,15 +33,16 @@ src_prepare() {
 	eautoreconf
 }
 
-multilib_src_configure() {
+src_configure() {
 	local myeconfargs=(
-		--disable-static
 		$(use_enable cpu_flags_x86_mmx mmx)
 	)
-	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
+
+	econf "${myeconfargs[@]}"
 }
 
-multilib_src_install_all() {
-	einstalldocs
+src_install() {
+	default
+
 	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/media-libs/libgii/Manifest b/media-libs/libgii/Manifest
index 6dd1c4488661..0adc947b77c6 100644
--- a/media-libs/libgii/Manifest
+++ b/media-libs/libgii/Manifest
@@ -2,5 +2,5 @@ AUX libgii-0.9.0-linux26-headers.patch 422 BLAKE2B 630d1c98cc2e9b5424dbc41d2453e
 AUX libgii-1.0.2-configure-cpuid-pic.patch 451 BLAKE2B 2a19985eda7c5cafaf40d68b20338193996d18cfaa11639e31ea2c38c3e4eda5808c8efbbb39b46dd9ad2570adabf0195b287c9307a603c2e5497e6f5dfb1074 SHA512 94aa2b1996ac7ccc1275853c72bda6a0f050c79010354d87dd551484c8bf3fb8eaa2cbc6b13620cb317bddc9da938c3106af71e2f0da70f9b62db7e27c404743
 AUX libgii-1.0.2-libtool_1.5_compat.patch 468 BLAKE2B 32d18ef7cfa6e14be36e8eeccf321a988990b3f48caa422ec07988dd8cde0d4c5c1ae7233700c696e45933b56f7555a1b00efd1062be1f4f5d73074b1695cea7 SHA512 c7c2d3cd91ba91cdc60778f5d599f2ee428c3b41a213193f733c4fe86b8e2a778009f8816d6314ad7519e5732065cf51016441306bb05f7ba669ef4000769312
 DIST libgii-1.0.2.src.tar.bz2 701099 BLAKE2B 29e23c4f0b0045e05dac855bba10d03e5b38cc3b2fdd494892c52954b4c4bbd990148aff98540bef73048ae26bab79db3369e7731707bfa4eab2b39d256681ad SHA512 d45b236e08bb8c6a7a7741ae694650dfc5681712a174f923c9132c41acb388d0d6dbc5589104a7a6bc73c98088f2b5967ee726d83c1f3e913602661c8d30bf07
-EBUILD libgii-1.0.2-r2.ebuild 1243 BLAKE2B 563e83f0713ad66e1e439c0b11fc7651e863bd44dc83161f0ce305e19dda463733e3794150f0a36296d42ce8e9a054425b2ea3694d09f6f1fe07ac5af46e24fe SHA512 f8656e6a20bfb114f05bd3730cd0abbbd0ffdb30557e8adb039c6053ff74232f0dff19fe495ce0acc8cc248e487564e37cb80aad77efb0a264ad0581014918bc
+EBUILD libgii-1.0.2-r3.ebuild 1057 BLAKE2B 649429780100a1159f1bd044ca501c6d98436f97e52a75664614ee86fc2cceedc33b5cef56be1c047d4b0f833ebb098cf35458257b7938f64de0ff889e69046d SHA512 ad2c21a58787caf94d7487326f75bf487f46e9af31e1f893a26cd9bfc0c907920abf2f997e2be94dddf0c48dfbe0d1113fde4706b71f17b8c22fc18fd5ade67c
 MISC metadata.xml 297 BLAKE2B 5224c162fdbab9d408c0b908e21f3b910c078888b850127f6c0ac140f1db19de89677b89465d56efe0d336e9f3bba8ffb0167d228c2daaba8c05c819e8788c35 SHA512 1d1d5cf70a0dddfb1f131cb9253cb13dbed3995a801485ca0a4e7194ef128e50cd70e42113d4d2c0d3b73b09d520ef5e3fd2b41fd2dd078a42c6c17f1f6976f8
diff --git a/media-libs/libgii/libgii-1.0.2-r2.ebuild b/media-libs/libgii/libgii-1.0.2-r3.ebuild
index fa64df33f0cc..1d7d2bbc8b70 100644
--- a/media-libs/libgii/libgii-1.0.2-r2.ebuild
+++ b/media-libs/libgii/libgii-1.0.2-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools multilib-minimal
+inherit autotools
 
 DESCRIPTION="Easy to use, but yet powerful, API for all possible input sources"
 HOMEPAGE="https://ibiblio.org/ggicore/packages/libgii.html"
@@ -16,8 +16,8 @@ IUSE="X"
 
 RDEPEND="
 	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86dga-1.1.4[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2
+		>=x11-libs/libXxf86dga-1.1.4
 	)"
 DEPEND="${RDEPEND}
 	kernel_linux? ( >=sys-kernel/linux-headers-2.6.11 )"
@@ -28,28 +28,27 @@ PATCHES=(
 	"${FILESDIR}"/${P}-libtool_1.5_compat.patch
 )
 
-DOCS=( ChangeLog ChangeLog.1999 FAQ NEWS README )
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/ggi/system.h )
-
 src_prepare() {
 	default
-	rm -f acinclude.m4 m4/libtool.m4 m4/lt*.m4
-	AT_M4DIR=m4 eautoreconf
 
-	multilib_copy_sources
+	rm -f acinclude.m4 m4/libtool.m4 m4/lt*.m4 || die
+
+	AT_M4DIR="m4" eautoreconf
 }
 
-multilib_src_configure() {
+src_configure() {
 	local myeconfargs=(
 		$(use_with X x)
 		$(use_enable X x)
-		--disable-static
 	)
-	econf ${myeconfargs[@]}
+
+	econf "${myeconfargs[@]}"
 }
 
-multilib_src_install() {
+src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+
+	dodoc ChangeLog.1999
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libmpeg3/Manifest b/media-libs/libmpeg3/Manifest
index 994843450f09..aa8ac1fa87fd 100644
--- a/media-libs/libmpeg3/Manifest
+++ b/media-libs/libmpeg3/Manifest
@@ -1,4 +1,4 @@
 DIST libmpeg3-1.8-patches-r0.tar.xz 5012 BLAKE2B b4a9a50f5765d233d48c50ef2156fa84a1e3804415847eabb33c9987597fba964983f89f973ba4f5458d5a0e77882b878b7b33a7c22adb1d3ad0824698126bad SHA512 233136e214403dc37bf5a6e66e017a051455f6745c57e204c1d0cd4ffcb8e0df858f945520e183886cf4df1930a2a566b08f69e9292642ec1eacffa0946c830b
 DIST libmpeg3-1.8-src.tar.bz2 2452350 BLAKE2B f5d4a3f7291847baa35bf5103f7bc5d79122d488c1f89ae6006912666cd29d4651cc74721e5e451f543c2493f64bd3cae0fa72384d866454cae6f3e0a2e77985 SHA512 e381f07d46d47d391c6db420791a065e3572e17ca63966eb52712560867866683505693f73b25869059319eec66fd1c2f923dbef1fdca5ef9efbe598e217d60e
-EBUILD libmpeg3-1.8-r2.ebuild 1810 BLAKE2B c33aed2331c5ca419438855e57b81acdcd120ead6e785bf8c2e9fdbe86ff779a896b1688561ad62d23525626f3d400a640e18a50d764e7fb32ece1cf8305751a SHA512 d574ddf439275e2ba76f7ded5be1ed2482e9b97d0ebfe6fb013b79bec0de3caeb63535b34fdf7590ffe09b25d91ab0d6c91fa70bbe8569452e6142bac7b42172
+EBUILD libmpeg3-1.8-r3.ebuild 1758 BLAKE2B 768cd75cabee529f7b403f377cc0fd16d4b12f26d67412850f0d11af93c43ebcc834531dd5f4ea1b70844d0442c6d8679411c262d367b2fb8c2757a94e554f16 SHA512 6abcc8bea8349ae7c15347b4d7adc41648285a7590eb332b427d8ea4270763fb1244debc95f72528daa5b51d340f8c541789c5af29723f1b81ce9a2803fb67e2
 MISC metadata.xml 310 BLAKE2B 7587cb72a91920b8ccaa188ac9adc08790997f2725c59e89c1a4f9ed5e07da4dd52b04e755655164a97eac3fe1d9c4c0aa89bea143c45843880916fb0b0dcae0 SHA512 acea51c1ce1d726d09c8b39557afe59844f17da2b78531d24faa7b1294b81fdb8c3cb6731548e5407ad0720023d176bf18d70edbacf6def86c01f26a7409c4d7
diff --git a/media-libs/libmpeg3/libmpeg3-1.8-r2.ebuild b/media-libs/libmpeg3/libmpeg3-1.8-r3.ebuild
index c1a9ce4e0139..ccce63d45959 100644
--- a/media-libs/libmpeg3/libmpeg3-1.8-r2.ebuild
+++ b/media-libs/libmpeg3/libmpeg3-1.8-r3.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=8
 
-inherit autotools multilib-minimal
+inherit autotools
 
-DESCRIPTION="An mpeg library for linux"
+DESCRIPTION="An MPEG library for linux"
 HOMEPAGE="http://heroinewarrior.com/libmpeg3.php"
 SRC_URI="
 	mirror://sourceforge/heroines/${P}-src.tar.bz2
@@ -18,8 +18,8 @@ IUSE="cpu_flags_x86_mmx"
 
 RDEPEND="
 	media-libs/a52dec
-	sys-libs/zlib
-	virtual/jpeg:0"
+	media-libs/libjpeg-turbo:=
+	sys-libs/zlib"
 DEPEND="${RDEPEND}"
 BDEPEND="cpu_flags_x86_mmx? ( dev-lang/nasm )"
 
@@ -40,21 +40,22 @@ src_prepare() {
 	eautoreconf
 }
 
-multilib_src_configure() {
+src_configure() {
 	# disabling css since it's a fake one.
 	# One can find in the sources this message :
 	#   Stubs for deCSS which can't be distributed in source form
-	ECONF_SOURCE="${S}" econf \
+	econf \
 		$(use_enable cpu_flags_x86_mmx mmx) \
 		--disable-css
 }
 
-multilib_src_install_all() {
+src_install() {
 	HTML_DOCS=( docs/. )
-	einstalldocs
+
+	default
 
 	# This is a workaround, it wants to rebuild
-	# everything if the headers	 have changed
+	# everything if the headers have changed
 	# So we patch them after install...
 	cd "${ED}"/usr/include/libmpeg3 || die
 	# This patch patches the .h files that get installed into /usr/include
diff --git a/media-libs/libreplaygain/Manifest b/media-libs/libreplaygain/Manifest
index 6bb1ab895da9..c529c0a8f874 100644
--- a/media-libs/libreplaygain/Manifest
+++ b/media-libs/libreplaygain/Manifest
@@ -1,4 +1,4 @@
 AUX libreplaygain-static-libs.patch 1145 BLAKE2B e90da6268c258998ed333cbc89918f62f0cb2d5454c98af700cf6b9b3d62d780e4e4ce931f9d5bfff4a74cce8770c308525b895b3de163725cb8fd07445cd330 SHA512 738b50523dd527781fa7f1df1bf3f0ffe26925684ab3ae1b14b1c7cac9e150384deceab0de70c05cda474f4e3781c83ff0335255471c92dc06edfdfef330e898
 DIST libreplaygain-477.tar.xz 8272 BLAKE2B 6382984643aad155b3e5e0dac8a7ca698320068c62fa87ac7f466e34e850f05df1e823d87f7cb477bd22f59c97f7e5ac8757e9bd6f59c2f5f1852efe9f083d72 SHA512 9e81deb237e35e63d67efabcbfe40f5a6fd34f4a6b0239a21e6ab8ba3c9ca172297cf323fbc4ada749dcfcdf0b711c354e39f12af9a9576900384c441657ff8e
-EBUILD libreplaygain-477-r1.ebuild 815 BLAKE2B 3b4049bc86b31dc2f87a0cd8b89c450899bc1e21741e15560677364d33f0f191a51029c9ac6c911b7369c31e97c257b25df66dfa3c14054ae35bfa52c17351b5 SHA512 7f2e87a4e810243c659b4a32d8aecd9de31d162fa4605d1a12e6bf2231623f33cd1f0c6e9cf893f70b1e88e18f9231ddd827d4b6b3b0a4887d5d8612c7338081
+EBUILD libreplaygain-477-r2.ebuild 797 BLAKE2B 0179fa76ba1f6b1267fbce5187827a38c134e1d93274709def66eda7ef8ec454fc90abc4505a798d648ea871a43dc34756406418be78531bbad55588540263ec SHA512 69f0ba8dc79dc627d37428f360731396ad7e1d0250f5b88502987e0e7c108da78e3618dc34919e9cf1dfcf786eb1711d60f79f682707e9cda18b37c59c764550
 MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/media-libs/libreplaygain/libreplaygain-477-r1.ebuild b/media-libs/libreplaygain/libreplaygain-477-r2.ebuild
index 9fd946d226ac..c63499b43c26 100644
--- a/media-libs/libreplaygain/libreplaygain-477-r1.ebuild
+++ b/media-libs/libreplaygain/libreplaygain-477-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake-multilib
+inherit cmake
 
 # svn export http://svn.musepack.net/libreplaygain libreplaygain-${PV}
 # tar -cJf libreplaygain-${PV}.tar.xz libreplaygain-${PV}
@@ -25,7 +25,7 @@ src_prepare() {
 }
 
 src_install() {
-	cmake-multilib_src_install
+	cmake_src_install
 	insinto /usr/include
 	doins -r include/replaygain
 }
diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest
index d93c7df56513..e11be47e3bdd 100644
--- a/media-libs/openh264/Manifest
+++ b/media-libs/openh264/Manifest
@@ -1,9 +1,6 @@
 AUX openh264-2.1.0-pkgconfig-pathfix.patch 1949 BLAKE2B a3894b7cb65fcdb444d389ccf6644e404bb8375a910bd51bbe5e1b6b773e4d6890a17d2f1a09400d6d0cadc41be9321d86a09b93f861812f2d72a6c1c5e39fde SHA512 00c59bd1d6fe6355ce81ead4ba898f1f602e9f9c93e382c2ead3c353d5fd1f2bf3c46a30f3b248896c9a74d347a24e200644387ce3c70e886d941c115bb42088
 AUX openh264-2.3.0-pkgconfig-pathfix.patch 2023 BLAKE2B 9d380302efe14b45959123f69591aed9f552a954dd9f2f079ba1dc95edfc59869db9ece0ea65d52e58201829e0e4bb791f0380b36b35d288b40769c1c144005e SHA512 24fb7e1bf54d5c1512dab9f5b6cbd61863022d99a1a5d07d5a69037ad3b3857f2ac01fdfae4a1477f1b200c8a4b107247fb9f46af1219e71220e55167f1620ec
 DIST gmp-api-Firefox39-3a01c086d1b0394238ff1b5ad22e76022830625a.tar.gz 10464 BLAKE2B db6990a55b4128c267ee5ffa4e38edd2551c862e549776b4092d5683818001366665830c6304642cdd9c2c0afe06035edebafde769693082ae7a5236cdc463e8 SHA512 a6383834391d98754177b54df31d006144b5cad952df60115fd12fb6f0c87e571a10f9ce7276b817e4137efd97ffa7bca5092e289b0eb7cde2a3ad923319e874
-DIST gmp-api-Firefox39-e3935759360861812d33cbd3b713e25f1de1ecb5.tar.gz 10440 BLAKE2B 92379258f2664778baee50b99573dbeae50e723a3f7605c62a4ca3aedd9129fbd1991d7b3ead1b8a3689e71f783ded0b15dca5e6d910345c95a6f28898bbdda3 SHA512 85e4b58cc66072fad2b6dbaa65a955a8931f73eb3664f05ddca65157ac5c2547225910c36b4507d88179a95cfb35a5aff6edadd3c0fa5418529c80ae6d736f44
-DIST openh264-2.2.0.tar.gz 60275282 BLAKE2B 69e44396de229c65cf7a87d6f9ce8e2ef67fbdad6740f6aa64825b71fc00af945dca3e4726b9f0b4f4b83e363f3f7aadadabbab291c612b0fb61b42478a8cacf SHA512 637e2bfa45ad586c10fc8990cad4d824ada07e277fd965c3a6cdd19bc7836b2d7082574037a3ff2ee631207dd8cb0ec4f68abafdc19646b433de561c47ce8d38
 DIST openh264-2.3.0.tar.gz 60290792 BLAKE2B 08aa571471188c72bb0f098fa1cfaf9ba46ee4311f50518de868a2d7bbd61d9d4547cf5d33b3140d56c09a1ea7ea411bfaa96ed960e159876e6cc803f081b5d3 SHA512 5f0ccbb3c0026a010d9830e973312486f9d5ea8152afa3653ab6b3c43906a1169cebea70532134c1624846cc03b586e85b12cfd0621af505bd532a7dd833defd
-EBUILD openh264-2.2.0.ebuild 3615 BLAKE2B 4558f97d1cecd36a9417a0ee9205b3f39fa72c1716d0f0fa80e1f1150fd0a3c01f49da973f01878e9ffcf16756835fa825685ce6951d1e3d52330b96c63b4a37 SHA512 7b58faf74d181c2637ad9647fc0d53ee209839316b772b8f0e6ce96228419ad9fcf41fc9d01b1ba0fa59e595683d843ad3766dc9995bdc7fd11aec97f9c9d914
 EBUILD openh264-2.3.0.ebuild 3618 BLAKE2B 9ea4acd09a5c2281a99a576974bf3d0348fd54377349a68fb94ff983051a6f27a4a59c8b756124e48cdab8e92dfa336558e804ab80da4fd15cb271428de45977 SHA512 6cc32135588b0da11776558c210e7bc8ddca89f4028d4ad1fe283c046b08b058eac6404320937f7d1c6e3ac17fbaa14f7f04f505a1915d68fa2b393c72691efa
 MISC metadata.xml 569 BLAKE2B 14a021fba978f0156bab46178d05a6b9f8f67fdeba784d587759207fe60ea1d74a383eec3fc40662c39d33fcecb71d8cafe7eb6354383c253e0a3f7f1e94feae SHA512 ceb77117c6a50f16640b329368c86db26127b8e501475dbaca4c53ba41315b0fc7161f6d9268cb86d1f6dbf2cf867e2bb0e6b5f45240ab3227b99b734c344efd
diff --git a/media-libs/openh264/openh264-2.2.0.ebuild b/media-libs/openh264/openh264-2.2.0.ebuild
deleted file mode 100644
index 5eca5a26ae02..000000000000
--- a/media-libs/openh264/openh264-2.2.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs multilib-minimal
-
-MOZVER=39
-MY_GMP_COMMIT="e3935759360861812d33cbd3b713e25f1de1ecb5"
-
-DESCRIPTION="Cisco OpenH264 library and Gecko Media Plugin for Mozilla packages"
-HOMEPAGE="https://www.openh264.org/ https://github.com/cisco/openh264"
-SRC_URI="https://github.com/cisco/openh264/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/mozilla/gmp-api/archive/${MY_GMP_COMMIT}.tar.gz -> gmp-api-Firefox${MOZVER}-${MY_GMP_COMMIT}.tar.gz"
-LICENSE="BSD"
-
-# openh264 soname version.
-# (2.2.0 needed a minor bump due to undocumented but breaking ABI changes, just to be sure.
-#  https://github.com/cisco/openh264/issues/3459 )
-SLOT="0/6.1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="cpu_flags_arm_neon cpu_flags_x86_avx2 +plugin utils"
-
-RESTRICT="bindist test"
-
-BDEPEND="
-	abi_x86_32? ( dev-lang/nasm )
-	abi_x86_64? ( dev-lang/nasm )"
-
-DOCS=( LICENSE CONTRIBUTORS README.md )
-
-PATCHES=( "${FILESDIR}/${PN}-2.1.0-pkgconfig-pathfix.patch" )
-
-src_prepare() {
-	default
-
-	sed -i -e 's/ | generate-version//g' Makefile || die
-	sed -e 's|$FULL_VERSION|""|g' codec/common/inc/version_gen.h.template > \
-		codec/common/inc/version_gen.h
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	ln -s "${WORKDIR}"/gmp-api-${MY_GMP_COMMIT} gmp-api || die
-}
-
-emakecmd() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
-	emake V=Yes CFLAGS_M32="" CFLAGS_M64="" CFLAGS_OPT="" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR_NAME="$(get_libdir)" \
-		SHAREDLIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
-		INCLUDES_DIR="${EPREFIX}/usr/include/${PN}" \
-		HAVE_AVX2=$(usex cpu_flags_x86_avx2 Yes No) \
-		ARCH="$(tc-arch)" \
-		$@
-}
-
-multilib_src_compile() {
-	local myopts="ENABLE64BIT=No"
-	case "${ABI}" in
-		s390x|alpha|*64) myopts="ENABLE64BIT=Yes";;
-	esac
-
-	if use arm; then
-		myopts+=" USE_ASM=$(usex cpu_flags_arm_neon Yes No)"
-	fi
-
-	emakecmd ${myopts}
-	use plugin && emakecmd ${myopts} plugin
-}
-
-multilib_src_install() {
-	emakecmd DESTDIR="${D}" install-shared
-
-	if use utils; then
-		newbin h264enc openh264enc
-		newbin h264dec openh264dec
-	fi
-
-	if use plugin; then
-		local plugpath="${ROOT}/usr/$(get_libdir)/nsbrowser/plugins/gmp-gmp${PN}/system-installed"
-		insinto "${plugpath}"
-		doins libgmpopenh264.so* gmpopenh264.info
-		echo "MOZ_GMP_PATH=\"${plugpath}\"" >"${T}"/98-moz-gmp-${PN}
-		doenvd "${T}"/98-moz-gmp-${PN}
-
-		cat <<PREFEOF >"${T}"/${P}.js
-pref("media.gmp-gmp${PN}.autoupdate", false);
-pref("media.gmp-gmp${PN}.version", "system-installed");
-PREFEOF
-
-		insinto /usr/$(get_libdir)/firefox/defaults/pref
-		newins "${T}"/${P}.js ${PN}-${PV/_p*/}.js
-
-		insinto /usr/$(get_libdir)/seamonkey/defaults/pref
-		newins "${T}"/${P}.js ${PN}-${PV/_p*/}.js
-	fi
-}
-
-pkg_postinst() {
-	if use plugin; then
-		if [[ -z ${REPLACING_VERSIONS} ]]; then
-			elog "Please restart your login session, in order for the session's environment"
-			elog "to include the new MOZ_GMP_PATH variable."
-			elog ""
-		fi
-		elog "This package attempts to override the Mozilla GMPInstaller auto-update process,"
-		elog "however even if it is not successful in doing so the profile-installed plugin"
-		elog "will not be used unless this package is removed.  This package will take precedence"
-		elog "over any gmp-gmpopenh264 that may be installed in a user's profile."
-		elog ""
-	fi
-
-	if use utils; then
-		elog "Utilities h264enc and h264dec are installed as openh264enc and openh264dec"
-		elog "to avoid file collisions with media-video/h264enc"
-		elog ""
-	fi
-}
diff --git a/media-libs/pcaudiolib/Manifest b/media-libs/pcaudiolib/Manifest
index 58fcce7b01eb..75fe3f2b5aae 100644
--- a/media-libs/pcaudiolib/Manifest
+++ b/media-libs/pcaudiolib/Manifest
@@ -1,5 +1,9 @@
+AUX 0001-Fix-audio-choppiness-on-some-systems.patch 1081 BLAKE2B da04d5e419417364a81d4de6ffa4209100559a0a0e1f8ea5df876e9a4aa3fb80fbc90fa63bf2aaff22f96b72778b04900af929715bfd831217b1550d84f27944 SHA512 e753262d4a9ff25bd2544d6a4c590a6694a734e635d14d6907066b08fc757eb895535fb60ade14f04df10cce3d2fcacb52b12dbecef2659bdee7d1655d081ffa
+AUX 0002-Fix-latency-related-buffer-sizing.patch 3032 BLAKE2B 6e92899e43d5c6ef26b68618018c9046d3545bc498b73a1ce7a89e28db5a5542242a5759c10ea8c9316cd2c1356c6326c7c03871ed5fab739b8099b61ad81a44 SHA512 befbbd4a92a20da93ff16388afba2d2d345aec501070e6cd7c570499481c72a495afb86d7174a31cdc671e4f60da9bcd4e027e0d8099c57622393a93c1755caf
+AUX 0003-Copy-audio-buffer-and-send-for-playback-without-bloc.patch 3002 BLAKE2B b09f46862f57950735b47863da8035d00a7d9ada48d20a7576f7cb50c5886dceb2547cb17a31704704da827eb5bc0a5d9b8ef4eb95b52375d97f125d9b54017a SHA512 197a4b52dc3de402e03fcc177db0f128624a525774f064b6e0fca4aaa6bf39c4dea574437056ca05a5209658ca01968c756cbcf130144ad2dd0badcea7c948bd
 DIST pcaudiolib-1.1.tar.gz 34049 BLAKE2B 7c6ce1532c47db30db2b80be690453257148be9a7115cd24dabda3dfcaca667d5c3a8278276f278556406144461cda48905ce581f0fde2f8429b3f829a948a36 SHA512 d503c11b355601e1e05f0f438a0cd9ce277d19fd53d3f7edf26f6e17f1f8184e8b2112a282e8ed74db8646bb5534d2a9a3c707b1742ce02ef13fd89669785007
 DIST pcaudiolib-1.2.tar.gz 34310 BLAKE2B a16e50fd789a88f10a56323afd2637c13e2383392cc287aad4cd8ef3f1f475c2754dca53e0fd5453b5fc9ee45392a0b9b6d8d7a2d0e88214e6194bbc2ce1e1ff SHA512 0a0fe2a21a8410ad5196272cc579137764d5a4beba16b3c5cf46cd2967132bb48def4c7977a7ae48ff1a0a6d53e454affc6c5add503e73e7805f15aa93231af3
 EBUILD pcaudiolib-1.1.ebuild 906 BLAKE2B 476584493a6df9208eabaae5624ff8dd7b8baf0fd446925d36aa8a745d8ca65de7dd63c956e7c491056b7922a67685c8d28dc2e0802eda65d8b3fe5ad38b671d SHA512 6bf05d943836af577e4e707513707e7fd089ca86e290b9684a1fe5c7285096ca36ceb906e2360929275290f6454cad3e8040b1c94fc89613325d743ca15c01bd
+EBUILD pcaudiolib-1.2-r1.ebuild 1129 BLAKE2B 1f387685c1704214c47bc080522e2e9ad4842da59570fc9cf2104229a836ebbe0b49c9e7a0ba839685890718176188647997c081dc7eab9bcaeff03060290de8 SHA512 6f41622ef78942dbe60bae06a1eff84d739b309ffccc727e470447ede9d71f071efd188bf45b101f7f2d5a256810f9cdff385e359259c0bf2e77e8d25b41becd
 EBUILD pcaudiolib-1.2.ebuild 913 BLAKE2B ed457308eefb1dc8dae0df707d4fe75d061c5b7acc03421d6a1ba086d714fc5c5e636389609c9ae0e2549417c5aa090afa885dcfa00de62d0f0e2552a2003868 SHA512 3aca7ce944a82177edc4a065afe4a55bc9bf535e5674db17ee16f5b20aeb765dbc4c4c3d7eb463681e2bc5359ab5dc2537bb04941d5a0e2f7af77255e07c9d6b
 MISC metadata.xml 588 BLAKE2B e148577ddfbf9688495e1a620708903f0bbe126ea9bff194e6b0f75a0e2a36ec52567f4d7a86381f89fb6c2e828ae372217e983d30810bb62dc60c0692420fed SHA512 d5de3f26535c7b147515cd9952951ed16be99345d309c7110c36a93fcd3f44f43373293d082c60170dfe5e05956d22b4c2cc1dd7343b3c28188f935ba8feaadf
diff --git a/media-libs/pcaudiolib/files/0001-Fix-audio-choppiness-on-some-systems.patch b/media-libs/pcaudiolib/files/0001-Fix-audio-choppiness-on-some-systems.patch
new file mode 100644
index 000000000000..b8c147454df9
--- /dev/null
+++ b/media-libs/pcaudiolib/files/0001-Fix-audio-choppiness-on-some-systems.patch
@@ -0,0 +1,36 @@
+From 478bb69d51a945123a18dedf4bee7a3bede67f40 Mon Sep 17 00:00:00 2001
+From: Nicolas Pitre <nico@fluxnic.net>
+Date: Sat, 2 Apr 2022 22:04:30 -0400
+Subject: [PATCH] Fix audio choppiness on some systems
+
+Commit a41d46e816d2 ("Fix cancellation snappiness") made espeak unusable
+on the RaspberryPi due to extreme audio choppiness. This can sometimes
+be observed on some PC-type systems as well, albeit much less
+prominently.
+
+Relax the timing to the smallest value that makes it work again on the
+RaspberryPi.
+---
+ src/audio_priv.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/audio_priv.h b/src/audio_priv.h
+index 669a037..0c2ce3c 100644
+--- a/src/audio_priv.h
++++ b/src/audio_priv.h
+@@ -53,8 +53,10 @@ struct audio_object
+ };
+ 
+ /* We try to aim for 10ms cancelation latency, which will be perceived as
+- * "snappy" by users */
+-#define LATENCY 10
++ * "snappy" by users. However, some systems (e.g. RPi) do produce chopped
++ * audio when this value is smaller than 60.
++ */
++#define LATENCY 60
+ 
+ #if defined(_WIN32) || defined(_WIN64)
+ 
+-- 
+2.35.1
+
diff --git a/media-libs/pcaudiolib/files/0002-Fix-latency-related-buffer-sizing.patch b/media-libs/pcaudiolib/files/0002-Fix-latency-related-buffer-sizing.patch
new file mode 100644
index 000000000000..4af7da5c33a4
--- /dev/null
+++ b/media-libs/pcaudiolib/files/0002-Fix-latency-related-buffer-sizing.patch
@@ -0,0 +1,78 @@
+From 72da4a54a5afbbdadfa6d8131e0f4a9f08cf4394 Mon Sep 17 00:00:00 2001
+From: Nicolas Pitre <nico@fluxnic.net>
+Date: Wed, 6 Jul 2022 00:30:42 -0400
+Subject: [PATCH] Fix latency-related buffer sizing
+
+Turns out that eSpeak-NG (the main user of this lib) enforces a minimum
+buffer size of 60ms which is also the default size. This explains why
+smaller LATENCY values were inducing choppiness in the audio on some
+systems. Adjust the comment accordingly,.
+
+Also make sure computed buffer sizes don't land in the middle of a
+sample frame. Doing (samplerate * channels * LATENCY) / 1000 is wrong.
+
+Both ALSA and PulseAudio provide nice abstractions for buffer sizing
+so let's use them directly. In the ALSA case in particular, we want the
+period to be 60ms, not the whole buffer, so to interleave speech audio
+computation and audio playback.
+---
+ src/alsa.c       | 5 +++--
+ src/audio_priv.h | 5 +----
+ src/pulseaudio.c | 2 +-
+ 3 files changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/src/alsa.c b/src/alsa.c
+index c856788..a0da0f0 100644
+--- a/src/alsa.c
++++ b/src/alsa.c
+@@ -99,7 +99,8 @@ alsa_object_open(struct audio_object *object,
+ 
+ 	snd_pcm_hw_params_t *params = NULL;
+ 	snd_pcm_hw_params_malloc(&params);
+-	snd_pcm_uframes_t bufsize = (rate * channels * LATENCY) / 1000;
++	unsigned int period_time = LATENCY * 1000;
++	int dir = 0;
+ 
+ 	int err = 0;
+ 	if ((err = snd_pcm_open(&self->handle, self->device ? self->device : "default", SND_PCM_STREAM_PLAYBACK, 0)) < 0)
+@@ -114,7 +115,7 @@ alsa_object_open(struct audio_object *object,
+ 		goto error;
+ 	if ((err = snd_pcm_hw_params_set_channels(self->handle, params, channels)) < 0)
+ 		goto error;
+-	if ((err = snd_pcm_hw_params_set_buffer_size_near(self->handle, params, &bufsize)) < 0)
++	if ((err = snd_pcm_hw_params_set_period_time_near(self->handle, params, &period_time, &dir)) < 0)
+ 		goto error;
+ 	if ((err = snd_pcm_hw_params(self->handle, params)) < 0)
+ 		goto error;
+diff --git a/src/audio_priv.h b/src/audio_priv.h
+index 0c2ce3c..dbccb1c 100644
+--- a/src/audio_priv.h
++++ b/src/audio_priv.h
+@@ -52,10 +52,7 @@ struct audio_object
+ 	                         int error);
+ };
+ 
+-/* We try to aim for 10ms cancelation latency, which will be perceived as
+- * "snappy" by users. However, some systems (e.g. RPi) do produce chopped
+- * audio when this value is smaller than 60.
+- */
++/* 60ms is the minimum and default buffer size used by eSpeak */
+ #define LATENCY 60
+ 
+ #if defined(_WIN32) || defined(_WIN64)
+diff --git a/src/pulseaudio.c b/src/pulseaudio.c
+index 2f80c62..da6c49f 100644
+--- a/src/pulseaudio.c
++++ b/src/pulseaudio.c
+@@ -80,7 +80,7 @@ pulseaudio_object_open(struct audio_object *object,
+ 	battr.maxlength = (uint32_t) -1;
+ 	battr.minreq = (uint32_t) -1;
+ 	battr.prebuf = (uint32_t) -1;
+-	battr.tlength = pa_bytes_per_second(&self->ss) * LATENCY / 1000;
++	battr.tlength = pa_usec_to_bytes(LATENCY * 1000, &self->ss);
+ 	self->s = pa_simple_new(NULL,
+ 	                        self->application_name,
+ 	                        PA_STREAM_PLAYBACK,
+-- 
+2.35.1
+
diff --git a/media-libs/pcaudiolib/files/0003-Copy-audio-buffer-and-send-for-playback-without-bloc.patch b/media-libs/pcaudiolib/files/0003-Copy-audio-buffer-and-send-for-playback-without-bloc.patch
new file mode 100644
index 000000000000..5bc4eddc7edd
--- /dev/null
+++ b/media-libs/pcaudiolib/files/0003-Copy-audio-buffer-and-send-for-playback-without-bloc.patch
@@ -0,0 +1,118 @@
+From e0ff53614074feabc637598000f5799b480179c3 Mon Sep 17 00:00:00 2001
+From: zment <jani.karkkainen@gmail.com>
+Date: Tue, 16 Aug 2022 20:18:31 +0300
+Subject: [PATCH] Copy audio buffer and send for playback without blocking,
+ fixes Windows audio choppyness
+
+---
+ src/xaudio2.cpp | 60 +++++++++++++++++++++++++++++++++++++++++--------
+ 1 file changed, 51 insertions(+), 9 deletions(-)
+
+diff --git a/src/xaudio2.cpp b/src/xaudio2.cpp
+index 72190b4..bb9d5be 100644
+--- a/src/xaudio2.cpp
++++ b/src/xaudio2.cpp
+@@ -35,6 +35,25 @@ struct xaudio2_object
+ 	LPWSTR devicename;
+ };
+ 
++class VoiceCallbacks : public IXAudio2VoiceCallback
++{
++public:
++	void OnBufferEnd(void* pBufferContext) {
++		if (pBufferContext != NULL)
++		{
++			free((void*)pBufferContext);
++		}
++	}
++
++	// Stubs for all interface callbacks
++	void OnStreamEnd() { }
++	void OnVoiceProcessingPassEnd() { }
++	void OnVoiceProcessingPassStart(UINT32 SamplesRequired) { }
++	void OnBufferStart(void* pBufferContext) { }
++	void OnLoopEnd(void* pBufferContext) { }
++	void OnVoiceError(void* pBufferContext, HRESULT Error) { }
++} voiceCallbacks;
++
+ void
+ xaudio2_object_close(struct audio_object *object);
+ 
+@@ -59,7 +78,7 @@ xaudio2_object_open(struct audio_object *object,
+ 	if (FAILED(hr))
+ 		goto error;
+ 
+- 	hr = self->audio->CreateSourceVoice(&self->source, self->format);
++ 	hr = self->audio->CreateSourceVoice(&self->source, self->format, 0, 2.0f, &voiceCallbacks);
+ 	if (FAILED(hr))
+ 		goto error;
+ 
+@@ -110,6 +129,16 @@ xaudio2_object_drain(struct audio_object *object)
+ {
+ 	struct xaudio2_object *self = to_xaudio2_object(object);
+ 
++	while (true)
++	{
++		Sleep(10);
++
++		XAUDIO2_VOICE_STATE state = { 0 };
++		self->source->GetState(&state);
++		if (state.pCurrentBufferContext == NULL && state.BuffersQueued == 0)
++			break;
++	}
++
+ 	return S_OK;
+ }
+ 
+@@ -128,27 +157,40 @@ xaudio2_object_write(struct audio_object *object,
+ {
+ 	struct xaudio2_object *self = to_xaudio2_object(object);
+ 
+-	XAUDIO2_BUFFER buffer = {0};
++	BYTE* buf_data = (BYTE *)malloc(bytes);
++	memcpy(buf_data, data, bytes);
++
++	XAUDIO2_BUFFER buffer = { 0 };
+ 	buffer.AudioBytes = bytes;
+-	buffer.pAudioData = (const BYTE *)data;
++	buffer.pAudioData = buf_data;
++	buffer.pContext = buf_data;
+ 
+ 	HRESULT hr = S_OK;
+ 	if (SUCCEEDED(hr))
+ 		hr = self->source->SubmitSourceBuffer(&buffer);
+ 
+-	if (SUCCEEDED(hr))
+-		hr = self->source->Start(0);
++	XAUDIO2_VOICE_STATE state = { 0 };
++	self->source->GetState(&state);
++	UINT32 buffersQueued = state.BuffersQueued;
+ 
+-	if (SUCCEEDED(hr)) while (true)
++	while (FAILED(hr))
+ 	{
+ 		Sleep(10);
+ 
+-		XAUDIO2_VOICE_STATE state = { 0 };
+ 		self->source->GetState(&state);
+-		if (state.pCurrentBufferContext == NULL && state.BuffersQueued == 0)
+-			return hr;
++		if (state.BuffersQueued < buffersQueued)
++		{
++			hr = self->source->SubmitSourceBuffer(&buffer);
++
++			self->source->GetState(&state);
++			buffersQueued = state.BuffersQueued;
++		}
+ 	}
+ 
++
++	if (SUCCEEDED(hr))
++		hr = self->source->Start(0);
++
+ 	return hr;
+ }
+ 
+-- 
+2.35.1
+
diff --git a/media-libs/pcaudiolib/pcaudiolib-1.2-r1.ebuild b/media-libs/pcaudiolib/pcaudiolib-1.2-r1.ebuild
new file mode 100644
index 000000000000..6525aa93e2a9
--- /dev/null
+++ b/media-libs/pcaudiolib/pcaudiolib-1.2-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Portable C Audio Library"
+HOMEPAGE="https://github.com/espeak-ng/pcaudiolib"
+SRC_URI="https://github.com/espeak-ng/pcaudiolib/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+ ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+alsa oss pulseaudio"
+
+REQUIRED_USE="|| ( alsa oss pulseaudio )"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.18 )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/0001-Fix-audio-choppiness-on-some-systems.patch"
+	"${FILESDIR}/0002-Fix-latency-related-buffer-sizing.patch"
+	"${FILESDIR}/0003-Copy-audio-buffer-and-send-for-playback-without-bloc.patch"
+	)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local econf_args
+	econf_args=(
+		$(use_with oss)
+		$(use_with alsa)
+		$(use_with pulseaudio)
+		--disable-static
+	)
+	econf "${econf_args[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/plib/Manifest b/media-libs/plib/Manifest
index fc33d4835be9..64163215094f 100644
--- a/media-libs/plib/Manifest
+++ b/media-libs/plib/Manifest
@@ -3,5 +3,5 @@ AUX plib-1.8.5-CVE-2012-4552.patch 1322 BLAKE2B 384a50a970012b7dd41bcb0362ee88ee
 AUX plib-1.8.5-X11-r1.patch 341 BLAKE2B 09ba1a92f54dfb6bd5ca3a11f6c7201819ccc7b1613e0cbddcfb90ae250d87b672d1738d854c9d546ec1d5d8ebf78b501e3dca9e41dc7e1f891b101e3c0ca23c SHA512 3222424f668ba4267d150034fc3ac67770501c543cdd7849c8eda4d491d7cb4d3120101c7d548a20d3122561f0f27e8fb0592773c736d7fbf4bc500121bf9dc3
 AUX plib-1.8.5-shared-libs.patch 9520 BLAKE2B 1bfb85c5065e33a9c8be14861f4fd8978e1dcacf4c045c9b1e30dfd2715873ac1b953bfeed5e298e1140264f8c0d191bef28b6631e2bb98f4d7228c7576aaf9c SHA512 0fb342e726412885531188a05e3b05b2076398b1ec8eaaf22ba3e20f48248351917d5418a7086b1b8eeb0bfccae049e8cfa0f5d05cbd4bb7c20c3e69685065b5
 DIST plib-1.8.5.tar.gz 779133 BLAKE2B a74a0693463b1bbf8a6ac6a34e3a689775ac892d19e0fe2ed955e0bd4af2eb2a7f55ac2dfe5dc105333a07f634dc74a4f6347e8bbd75d2fcc5b55733aefb133d SHA512 17154cc77243fe576c2bcbcb0285b98aef1a0634658f5473e95fe0ac8fa3ed477dbe5620e44ccf0b7cc616f812af0cd44d6fcbba0c563180d3b61c9d6f158e1d
-EBUILD plib-1.8.5-r3.ebuild 927 BLAKE2B bedaeeabac3ffd43ec0c75ad8e5c9adf5b6e4f330565aecc0ee7554ffcc9bf2977cb2e88ae28ac62c1037962d14fd2d16bb03d44d34fdbef74c8633d05fb1b1c SHA512 2409a27ca687ade0da9e7c1c1fbe665354139837e1c17d3955fd4159a28eea570a83a304fa85c670cb015c0cca655daa67e4762143e61456994cb09fe0e9063f
+EBUILD plib-1.8.5-r4.ebuild 785 BLAKE2B 0d523f3401cfa3f56be36ef4355db1ab203ad895dc34aaa5ee0a848b6b44c389fbdd425d3554f7990016464ec4e3308c22dba57b6ce6e39f64ff3d6c4f6c12c7 SHA512 dd8700980e35e59b822e7d097d026e6e0f741a14a754cfede2e4260e08b118249119877d6690cb8f5892b53379561291e80a36e17716cffef5f287bbde92596a
 MISC metadata.xml 328 BLAKE2B a7a65e3a3905acfbe9ccada6071937f3cee936ba6bca021348f8960b3b1b83837136b1da21f10c5c511c8058655be268467e260da2fb841061f931d39baea368 SHA512 f7ed0e87ef2c31bf2890a202835482f9d174d08b591beabcceccb11f63fd09d586f735ed6e2978480d0a37bd0e23592146a982fc7b8067c1a5c28249d555a629
diff --git a/media-libs/plib/plib-1.8.5-r3.ebuild b/media-libs/plib/plib-1.8.5-r4.ebuild
index 90f35921162f..27d275bb8f4a 100644
--- a/media-libs/plib/plib-1.8.5-r3.ebuild
+++ b/media-libs/plib/plib-1.8.5-r4.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-inherit autotools multilib-minimal
+EAPI=8
 
-DESCRIPTION="multimedia library used by many games"
+inherit autotools
+
+DESCRIPTION="Multimedia library used by many games"
 HOMEPAGE="http://plib.sourceforge.net/"
 SRC_URI="http://plib.sourceforge.net/dist/${P}.tar.gz"
 
@@ -13,7 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ppc sparc x86"
 
 DEPEND="virtual/opengl"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-shared-libs.patch
@@ -24,20 +25,22 @@ PATCHES=(
 
 src_prepare() {
 	default
-	mv configure.in configure.ac || die
+
 	eautoreconf
 }
 
-multilib_src_configure() {
+src_configure() {
 	local myconf=(
-		--disable-static
 		--enable-shared
 	)
-	ECONF_SOURCE=${S} econf "${myconf[@]}"
+
+	econf "${myconf[@]}"
 }
 
-multilib_src_install_all() {
-	DOCS=( AUTHORS ChangeLog KNOWN_BUGS NOTICE README* TODO* )
-	einstalldocs
+src_install() {
+	default
+
+	dodoc KNOWN_BUGS TODO* NOTICE
+
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/resid/Manifest b/media-libs/resid/Manifest
index 5639a4e2ff0d..91b81d80abcc 100644
--- a/media-libs/resid/Manifest
+++ b/media-libs/resid/Manifest
@@ -1,4 +1,4 @@
 AUX resid-0.16_p2-drop-CXXFLAGS-override.patch 735 BLAKE2B d2e742d785752ce5cbca248b33ae50780b4623f6aae8757e9de548b323b38bb2ee8c56a4624ba65bb2ade61a0933ee9a42fc66baa600b995827e55492d84499d SHA512 a4ad17fc1aaa0e9b07103eafc18be9ccce7f13cb6fc21cb0e74e512382db7ce603ea29696d2f5328c7e3f67818626314c4275e58167052b913508bab89d4dd9d
 DIST resid-0.16-p2.tgz 329919 BLAKE2B 00f93b13351ec6387579755ad2b6b44394d6a1d2f2c0a6077e581db01628e84c07e6707b7c8b580492989adc8b5a5f89de670792b38bf2d8037b4abb22f88c2d SHA512 f7e86e97ea6d17c3e75b7763974b1182b49b2498c5fd3c1b0665c026ea6473cda3f9fc70bc123ac1357034879e3caaf41279d2253a8122246dc7e1c70c063d09
-EBUILD resid-0.16_p2-r1.ebuild 917 BLAKE2B 13a21768a1b2a2abaaac7547c7c821dcc873b623f65846aa4af0b956b31fa8a9cb0fc1f3bec9da474a443093646637824551e470ee50da367dd5179867e933b0 SHA512 172f88d9b8e8839041d780e0201a89f4b43b7b596ce76d706dc4100accfe687836c581d832a854afb0175656e6a73b90c6e2e5bd9a08a5fe171ab96b68986c87
+EBUILD resid-0.16_p2-r2.ebuild 841 BLAKE2B 69ebbba095cbdf8a3286c69fe1c1f0425c32b5dce98481249484f36160de0831a6b1adbb7ba1fdfdd6deeeb8a9c259ea0cc1e092a44e04082520003e1091a119 SHA512 6e512fb36d17dfc4df308b79cddab9e1eaffbcbffc10821210642371e2e32a0b83f351c888bed0b43536f4030ae4f3243f4bd83353c4dc3af457e737929dabb0
 MISC metadata.xml 332 BLAKE2B a47bef57d4111ad776ca4cb88fb84cf66013bad09182b8b6b64ebe79e81038d634db55a4078087fd5462c245134755a772c7d869dd2c851f7b4586d2c5c70e19 SHA512 091eebca8129671d51c99e4e2dbc778147583b0f6d75f171254d94a85756d1ecf103e39236e83d81b066ef45093e32c3b30bb6580bb596dc094bc091b44847d5
diff --git a/media-libs/resid/resid-0.16_p2-r1.ebuild b/media-libs/resid/resid-0.16_p2-r2.ebuild
index 6959ad0f820c..b4dc842c6028 100644
--- a/media-libs/resid/resid-0.16_p2-r1.ebuild
+++ b/media-libs/resid/resid-0.16_p2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools multilib-minimal
+inherit autotools
 
 MY_MAJ=$(ver_cut 1-2)
 
@@ -30,14 +30,13 @@ src_prepare() {
 	eautoreconf
 }
 
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-static \
+src_configure() {
+	econf \
 		--enable-resid-install \
 		--enable-shared
 }
 
-multilib_src_install() {
+src_install() {
 	default
 
 	dodoc "${S}"/VC_CC_SUPPORT.txt
diff --git a/media-libs/theoraplay/Manifest b/media-libs/theoraplay/Manifest
index 893b246cee85..f6bf897e0ebd 100644
--- a/media-libs/theoraplay/Manifest
+++ b/media-libs/theoraplay/Manifest
@@ -1,3 +1,3 @@
 DIST theoraplay-0_pre20180524.tar.bz2 14504 BLAKE2B 99580d65574887c283c8d7d1a588783bdb91ea5570adb4e194919ed930be558d62ddbd10e451746aa47bd6996cc3102f0b1eee50308cc278c2c6368a2a76d244 SHA512 509815535f73efe3b1c602b425d4a0aa78ce744809e8242fdfdecbb74a3a765d80b8e565dbdd00cd2daaf122365ba5a8651d302c907c714eae97f64607b7d0b8
-EBUILD theoraplay-0_pre20180524.ebuild 982 BLAKE2B 243f8081623bb289008de66e5051ec01c47895c96e572ba70b0f3fc9533f37c6cd08d3da55591245bcdd4792a66ba3322bc8b1a4db9c78065cdf061287e57377 SHA512 74a900d1431d426b8b4f32da1e783a69ee748f355193455fa915f6cbe5550d8edb7cffb57adf2ce6f7f23fd9d80c2a6148079ed779031952602e69c061d89ffa
+EBUILD theoraplay-0_pre20180524-r1.ebuild 961 BLAKE2B 82bc57bc3f75960fc0a7ac7619665ac476736505cf3c1687e9367d1dee3f859b49c67ef8876fe68c9b1b4843f873e979d0119c6af103cecb3bc7a4cea23c16b7 SHA512 79a8081e017576ce9b730cffc2495f6c4e57b99926c4ee80b8d8f2e760183a2d678b7724cbb3b9d77e4667cf23a3ca4f2af23919c6f8796dfaa7ac0071852abf
 MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
diff --git a/media-libs/theoraplay/theoraplay-0_pre20180524.ebuild b/media-libs/theoraplay/theoraplay-0_pre20180524-r1.ebuild
index 487a8f89eb15..dd50e14aae72 100644
--- a/media-libs/theoraplay/theoraplay-0_pre20180524.ebuild
+++ b/media-libs/theoraplay/theoraplay-0_pre20180524-r1.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit multilib multilib-minimal toolchain-funcs
+inherit edo multilib toolchain-funcs
 
 COMMIT="7d8701876294"
 DESCRIPTION="Simple library to make decoding of Ogg Theora videos easier"
 HOMEPAGE="https://icculus.org/projects/theoraplay/"
 SRC_URI="https://hg.icculus.org/icculus/${PN}/archive/${COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+S="${WORKDIR}"/${PN}-${COMMIT}
+
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -18,19 +20,16 @@ RDEPEND="
 	media-libs/libtheora
 	media-libs/libvorbis
 "
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/libtool"
 
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-multilib_src_compile() {
-	libtool --tag=CC --mode=compile $(tc-getCC) -shared ${CFLAGS} -pthread -c "${S}"/${PN}.c || die
-	libtool --tag=CC --mode=link $(tc-getCC) -shared ${LDFLAGS} -pthread -Wl,-z,defs ${PN}.lo \
-			-logg -ltheoradec -lvorbis -o lib${PN}.la -rpath "${EPREFIX}/usr/$(get_libdir)" || die
+src_compile() {
+	edo libtool --tag=CC --mode=compile $(tc-getCC) -shared ${CFLAGS} -pthread -c "${S}"/${PN}.c
+	edo libtool --tag=CC --mode=link $(tc-getCC) -shared ${LDFLAGS} -pthread -Wl,-z,defs ${PN}.lo \
+			-logg -ltheoradec -lvorbis -o lib${PN}.la -rpath "${EPREFIX}/usr/$(get_libdir)"
 }
 
-multilib_src_install() {
+src_install() {
 	dolib.so .libs/lib${PN}$(get_libname)*
-}
-
-multilib_src_install_all() {
 	doheader ${PN}.h
 }