11 files changed, 612 insertions, 2 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 9fec25887bc6..2123a879b886 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest
index 3a3b684f2532..553a0b373b08 100644
--- a/media-libs/coin/Manifest
+++ b/media-libs/coin/Manifest
@@ -6,5 +6,7 @@ AUX coin-4.0.0-0005-Slightly-fix-coin.cfg.cmake.in.patch 1394 BLAKE2B 40b43a0cce
 AUX coin-4.0.0-0006-Fix-underlinking-against-X11.patch 827 BLAKE2B 33aaa8281fc260bb382875a0b41eac83d8099e52709e93a523ba4b048e1f9ab92c1a17cb09e1c5dd091c90878c373ef973c380211f856b32581f97992a8cc83e SHA512 37709b1a853287245b0778297154a8ea15ed86d60558af541ccd60fb0ee369c296947964080bff790595030c8e41964e008b0983bcbf5146d3c5ac81756ff622
 AUX coin-4.0.0-0007-Locate-slotted-qhelpgenerator.patch 581 BLAKE2B 97f7784d780e5d06a8c032a9d5707bd1d883dee59a0c04fe06205b98f2f3bf38d547e683eb9474da0771c3fe0a0964e611a4108c5d34b44679be27a52fdb5639 SHA512 73b95646c47f2ec07f20fb776b5b7df8e8df45a1f13c002e15cce56a8d35e374cc6a0515461aa265ae70b49cde7648554dc9aafb84f27afb6e78f368b67b1b7e
 DIST coin-4.0.0-src.tar.gz 6824162 BLAKE2B 9dee9397bb63c0da02214d33f2661051a3fd99689956a6de5c2cf806dd05944038b87b690f954f35711ee5e4ab07f04685681b822d0bbab0d7941bef551202dc SHA512 e036276a243bfe252569cee1b67d38b8633fcf35bdf4e366a92ca67e23799d54d91fe272c23b383c451d330cee284809f28f237857493948149e0da1ebd64fae
+DIST coin-4.0.1-src.tar.gz 7125456 BLAKE2B 1f1b760a200c7086c6bf18e8b80882576495280900d9054ab61930327940b46f56789c01ec2a975ac04a1cb106f33d0a87f71d0f705159c84e8b2164d49949fc SHA512 4d18e2db854334244ab94fb206c001cd7ef3d9281eb4f24d52d5878a179ed0389da5721a74c51c30ec7bc7b01c2c091f0a09d63636a35fa064cdbcaca0770256
 EBUILD coin-4.0.0.ebuild 2831 BLAKE2B 6075ae2a437afebb3596b22dec63ea16a6910ee93d8aae7e1fab1f042daa96962453a3f944041de91f40ef05c9b0fd4d045e14bf45218799c1f63984615697ea SHA512 07df8aa1dc519b4583dc4c8363f09e6a045daf0da9d5bf5cde1282427e264195132b0d4caeb524c0992d19319857fca8cc3d0f29d60233b0913346dcaa31cd95
+EBUILD coin-4.0.1.ebuild 2465 BLAKE2B 163f463cd46aa03b9b91fe74eb6fb2ef2ece731ed1688c2c951b04d7bd883bdc28320bab8a0d7aaa83816e8156f41071eefcda4563c554414d5268e6ffd5fc83 SHA512 f1f1826cd21fa623c544af62a449fd5a11c85e868d0961090105a4d81b57221a694bba8a68a6b401fe9d42bc4e1e18fb28711f70e1ce0b92e9829fb0ad303c02
 MISC metadata.xml 456 BLAKE2B bc0dd1a54611c13dc18dc24cecb17034bf9dc1a2dec1f1ef8fb35c5ce08d5ad069ae19af9e4ed4ed4cea081c414da4db3ecde92eaef8d1095f7dd69ad17afabb SHA512 ac7dda1fbc082b46d13cff9ed35c9b129ab854b8ed3552f9b1dbd7a4be914a5871f219cd280fbd96e6ac4f0b184b74282b8e952818e8a3acef6b25e70f529bc6
diff --git a/media-libs/coin/coin-4.0.1.ebuild b/media-libs/coin/coin-4.0.1.ebuild
new file mode 100644
index 000000000000..18dceb5b38d3
--- /dev/null
+++ b/media-libs/coin/coin-4.0.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="A high-level 3D graphics toolkit, fully compatible with SGI Open Inventor 2.1"
+HOMEPAGE="https://github.com/coin3d/coin/wiki"
+SRC_URI="https://github.com/coin3d/coin/releases/download/v${PV}/${P}-src.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="|| ( GPL-2 PEL )"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="debug doc +exceptions javascript man openal qthelp test threads"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	man? ( doc )
+	qthelp? ( doc )
+"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/expat
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/simage
+	sys-libs/zlib
+	virtual/opengl
+	virtual/glu
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	javascript? ( dev-lang/spidermonkey:60 )
+	openal? ( media-libs/openal )
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost:0
+	x11-base/xorg-proto
+	doc? ( qthelp? ( dev-qt/qthelp:5 ) )
+"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.0-0007-Locate-slotted-qhelpgenerator.patch
+)
+
+DOCS=(
+	AUTHORS FAQ FAQ.legal NEWS THANKS docs/HACKING
+)
+
+src_configure() {
+	use debug && append-cppflags -DCOIN_DEBUG=1
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+
+		-DCOIN_BUILD_SHARED_LIBS=ON
+		-DCOIN_BUILD_TESTS=$(usex test)
+		-DCOIN_BUILD_DOCUMENTATION=$(usex doc)
+
+		-DCOIN_BUILD_INTERNAL_DOCUMENTATION=OFF
+		-DCOIN_BUILD_DOCUMENTATION_MAN=$(usex man)
+		-DCOIN_BUILD_DOCUMENTATION_QTHELP=$(usex qthelp)
+		-DCOIN_BUILD_DOCUMENTATION_CHM=OFF
+
+		-DCOIN_THREADSAFE=$(usex threads)
+		-DHAVE_VRML97=ON
+		-DCOIN_HAVE_JAVASCRIPT=$(usex javascript)
+		-DHAVE_NODEKITS=ON
+		-DHAVE_DRAGGERS=ON
+		-DHAVE_MANIPULATORS=ON
+		-DHAVE_SOUND=$(usex openal)
+		-DHAVE_3DS_IMPORT_CAPABILITIES=ON
+		-DUSE_EXTERNAL_EXPAT=ON
+		-DUSE_EXCEPTIONS=$(usex exceptions)
+		-DUSE_SUPERGLU=OFF
+
+		-DFONTCONFIG_RUNTIME_LINKING=OFF
+		-DFREETYPE_RUNTIME_LINKING=OFF
+		-DLIBBZIP2_RUNTIME_LINKING=OFF
+		-DOPENAL_RUNTIME_LINKING=OFF
+		-DSIMAGE_RUNTIME_LINKING=OFF
+		-DZLIB_RUNTIME_LINKING=OFF
+		-DGLU_RUNTIME_LINKING=OFF
+		-DSPIDERMONKEY_RUNTIME_LINKING=ON
+
+		-DCOIN_VERBOSE=$(usex debug)
+		-DHAVE_MULTIPLE_VERSION=OFF
+
+		-DCOIN_BUILD_SINGLE_LIB=ON
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	pushd "${BUILD_DIR}/bin" > /dev/null || die
+	./CoinTests -r detailed || die "Tests failed."
+	popd > /dev/null || die
+}
diff --git a/media-libs/libmpg123/Manifest b/media-libs/libmpg123/Manifest
new file mode 100644
index 000000000000..02e234a51ba1
--- /dev/null
+++ b/media-libs/libmpg123/Manifest
@@ -0,0 +1,5 @@
+AUX mpg123-1.32.3-build-programs-component.patch 1304 BLAKE2B f0e4694bba608c20ed0cb1db0cf5f1c90ec522fc2eee6c01e8440fd39351e7d6a3e4165bac3a0ea3c1355bd7351dd6fefec9a02f8925226064ff741f01e3033a SHA512 b049a1da5b0185637f07445bcb5a00d37ba8c51456f10ee555e73fcacde2a3227ec900eaa334f84605a6956610831df5fceedef6c078375a82a0808c492b46a6
+AUX mpg123-1.32.3-build-with-installed-libs.patch 7957 BLAKE2B 668aecace3cde2acb25474ea235b20b7c81398c1e4c91216dc95acaa3961683e6f87c0e1b5b3ffec0486484de7c2cf9fb85a41549013698ce3734ac41dba952e SHA512 6e59255199c19b5f3ca4cc9c3175b0f3e01440d44820806c3b3ad37291afa771809c556ce5369b9df45d98c6e300576b55ef1c61668fd0286372cb0afcf550a4
+DIST mpg123-1.32.3.tar.bz2 1111054 BLAKE2B 67f889403c2bb639d675ec5ebea5a19c4b7174971d62bdd8d940ad659e6b0c06dada38422fc9d71b878917aa89e305ec48c8faa78d65d507cd6a0c9a79951359 SHA512 946c1073b6eebfd65333ec543df1caeea25864479e9c8e153fb53d8b636cc756d8d81947f7b5cbedbbfb1ea664d3fb27562ed36e7726d95e80591bd2ad622afc
+EBUILD libmpg123-1.32.3.ebuild 2766 BLAKE2B de730a7d5dcbc365973090978d1cf3dd4107e448a42ef98c3ebada11051f2dbdf2adb31516a091b5aed90e4e75c56dfdfea617fd4761881426cdff6d2395fe7a SHA512 26043fbc612ab141ee704240eaa138260b4d349651a62e5511d577f812dbee65bc82671740d4f7ab3e423be6660957c891b8c50052b992deed2a9640eae5a14e
+MISC metadata.xml 526 BLAKE2B 42eed8f068420cefea4cf3e75a880889be7abe182feec2aa95e0e7f550cf68eb2582460e43500d24b7ad189adb3e0e135da1079efb405957fe3dfc6b93a91ece SHA512 11e572b6ec77d6c971766e666db84ee4b605479c3f89ba639177de7fb109a8d9e38d1f5034a52554736e6bd0915aae84830169ba3580f6d64794adc4c8cb9d0e
diff --git a/media-libs/libmpg123/files/mpg123-1.32.3-build-programs-component.patch b/media-libs/libmpg123/files/mpg123-1.32.3-build-programs-component.patch
new file mode 100644
index 000000000000..ea20c8a445f6
--- /dev/null
+++ b/media-libs/libmpg123/files/mpg123-1.32.3-build-programs-component.patch
@@ -0,0 +1,55 @@
+build: add programs component
+
+From: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
+
+Upstream PR: https://github.com/madebr/mpg123/pull/11
+Bug: https://bugs.gentoo.org/915858
+---
+ configure.ac |   20 ++++++++++++++++++--
+ 1 file changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e47c7d5b..db37ff9b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -440,6 +440,21 @@ AC_ARG_ENABLE(libsyn123,
+   ]
+ )
+ 
++AC_ARG_ENABLE(programs,
++  [AS_HELP_STRING([--enable-programs], [build (only) programs (with --disable-components)])],
++  [
++    if test "x$enableval" = xyes
++    then
++      build_programs=yes
++    else
++      build_programs=no
++    fi
++  ],
++  [
++    build_programs=no
++  ]
++)
++
+ if test "x$build_all" = xyes; then
+   build_programs=yes
+   build_libmpg123=yes
+@@ -447,8 +462,6 @@ if test "x$build_all" = xyes; then
+   build_libout123_modules=yes
+   build_libsyn123=yes
+   components="programs"
+-else
+-  build_programs=no
+ fi
+ 
+ AM_CONDITIONAL([BUILD_PROGRAMS],  [ test "x$build_programs" = xyes ])
+@@ -474,6 +487,9 @@ fi
+ if test "x$build_libsyn123" = xyes; then
+   components="$components libsyn123"
+ fi
++if test "x$build_programs" = xyes; then
++  components="$components programs"
++fi
+ components=$(echo $components)
+ 
+ dnl ############## Configurable Options
diff --git a/media-libs/libmpg123/files/mpg123-1.32.3-build-with-installed-libs.patch b/media-libs/libmpg123/files/mpg123-1.32.3-build-with-installed-libs.patch
new file mode 100644
index 000000000000..aec0ef87ebbf
--- /dev/null
+++ b/media-libs/libmpg123/files/mpg123-1.32.3-build-with-installed-libs.patch
@@ -0,0 +1,252 @@
+build: allow building with installed libmpg123 libsyn123 libout123
+
+From: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
+
+Upstream PR: https://github.com/madebr/mpg123/pull/11
+Bug: https://bugs.gentoo.org/915858
+---
+ Makefile.am                 |   18 +++++++++++++++---
+ configure.ac                |   33 +++++++++++++++++++++++----------
+ libmpg123.pc.in             |    2 +-
+ libout123.pc.in             |    2 +-
+ libsyn123.pc.in             |    2 +-
+ src/Makemodule.am           |   30 +++++++++++++++++++++++-------
+ src/libmpg123/Makemodule.am |    2 +-
+ src/libout123/Makemodule.am |    2 +-
+ src/libsyn123/Makemodule.am |    2 +-
+ 9 files changed, 67 insertions(+), 26 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 5b58dc4d..be3bfed0 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -37,13 +37,25 @@ AM_CPPFLAGS = -DPKGLIBDIR="\"$(pkglibdir)\""
+ AM_CPPFLAGS += \
+   $(LTDLINCL) \
+   -I$(top_srcdir)/src \
+-  -I$(top_srcdir)/src/compat \
++  -I$(top_srcdir)/src/compat
++
++if BUILD_LIBMPG123
++AM_CPPFLAGS += \
+   -I$(top_srcdir)/src/libmpg123 \
++  -I$(top_builddir)/src/libmpg123
++endif
++
++if BUILD_LIBSYN123
++AM_CPPFLAGS += \
+   -I$(top_srcdir)/src/libsyn123 \
++  -I$(top_builddir)/src/libsyn123
++endif
++
++if BUILD_LIBOUT123
++AM_CPPFLAGS += \
+   -I$(top_srcdir)/src/libout123 \
+-  -I$(top_builddir)/src/libmpg123 \
+-  -I$(top_builddir)/src/libsyn123 \
+   -I$(top_builddir)/src/libout123
++endif
+ 
+ # Include Make modules from subdirectories.
+ include src/Makemodule.am
+diff --git a/configure.ac b/configure.ac
+index db37ff9b..d782dbe5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -472,7 +472,7 @@ AM_CONDITIONAL([BUILD_LIBSYN123], [ test "x$build_libsyn123" = xyes ])
+ AM_CONDITIONAL([NEED_FMT123], [ test "x$build_libmpg123" = xyes || test "x$build_libout123" = xyes || test "x$build_libsyn123" = xyes ])
+ # If we install libraries, prompting pkgconfig and include directories.
+ AM_CONDITIONAL([NEED_LIB], [ test "x$build_libmpg123" = xyes || test "x$build_libout123" = xyes || test "x$build_libout123_modules" = xyes || test "x$build_libsyn123" = xyes ])
+-AM_CONDITIONAL([NEED_MAINLIB], [ test "x$build_libmpg123" = xyes || test "x$build_libout123" = xyes || test "x$build_libsyn123" = xyes ])
++AM_CONDITIONAL([NEED_MAINLIB], [ test "x$build_libmpg123" = xyes || test "x$build_libout123" = xyes || test "x$build_libsyn123" = xyes || test "x$build_programs" = xyes ])
+ 
+ 
+ if test "x$build_libmpg123" = xyes; then
+@@ -2911,15 +2911,28 @@ dnl ############## Library cleanup
+ 
+ PROG_LIBS=$LIBS
+ LIBS=
+-LIBMPG123_LIBS="$LIBM $COMPAT_LIBS"
+-LIBSYN123_LIBS=$LIBM
+-LIBOUT123_LIBS="$LIBRT $LIBM $COMPAT_LIBS"
++
++if test "x$build_libmpg123" = xyes; then
++  LIBMPG123_DEP_LIBS="$LIBM $COMPAT_LIBS"
++else
++  PKG_CHECK_MODULES(LIBMPG123, libmpg123, HAVE_LIBMPG123="yes", HAVE_LIBMPG123="no" check_failed=yes)
++fi
++if test "x$build_libsyn123" = xyes; then
++  LIBSYN123_DEP_LIBS=$LIBM
++else
++  PKG_CHECK_MODULES(LIBSYN123, libsyn123, HAVE_LIBSYN123="yes", HAVE_LIBSYN123="no" check_failed=yes)
++fi
++if test "x$build_libout123" = xyes; then
++  LIBOUT123_DEP_LIBS="$LIBRT $LIBM $COMPAT_LIBS"
++else
++  PKG_CHECK_MODULES(LIBOUT123, libout123, HAVE_LIBOUT123="yes", HAVE_LIBOUT123="no" check_failed=yes)
++fi
+ 
+ AC_SUBST(PROG_LIBS)
+ AC_SUBST(LIBM)
+-AC_SUBST(LIBMPG123_LIBS)
+-AC_SUBST(LIBSYN123_LIBS)
+-AC_SUBST(LIBOUT123_LIBS)
++AC_SUBST(LIBMPG123_DEP_LIBS)
++AC_SUBST(LIBSYN123_DEP_LIBS)
++AC_SUBST(LIBOUT123_DEP_LIBS)
+ 
+ dnl ############## Final Output
+ 
+@@ -3034,8 +3047,8 @@ echo "  CFLAGS='$CFLAGS'"
+ echo "  PROG_LIBS='$PROG_LIBS'"
+ echo "       (derived from LIBS, only used for end-user binaries and modules)"
+ echo "  LIBDL='$LIBDL'"
+-echo "  LIBMPG123_LIBS='$LIBMPG123_LIBS'"
+-echo "  LIBSYN123_LIBS='$LIBSYN123_LIBS'"
+-echo "  LIBOUT123_LIBS='$LIBOUT123_LIBS'"
++echo "  LIBMPG123_DEP_LIBS='$LIBMPG123_DEP_LIBS'"
++echo "  LIBSYN123_DEP_LIBS='$LIBSYN123_DEP_LIBS'"
++echo "  LIBOUT123_DEP_LIBS='$LIBOUT123_DEP_LIBS'"
+ echo
+ echo "Next type 'make' and then 'make install'."
+diff --git a/libmpg123.pc.in b/libmpg123.pc.in
+index a8f692eb..c980a8c5 100644
+--- a/libmpg123.pc.in
++++ b/libmpg123.pc.in
+@@ -8,5 +8,5 @@ Description: An optimised MPEG Audio decoder
+ Requires: 
+ Version: @PACKAGE_VERSION@
+ Libs: -L${libdir} -lmpg123 
+-Libs.private: @LIBMPG123_LIBS@
++Libs.private: @LIBMPG123_DEP_LIBS@
+ Cflags: -I${includedir} 
+diff --git a/libout123.pc.in b/libout123.pc.in
+index fc4713f3..2c09778c 100644
+--- a/libout123.pc.in
++++ b/libout123.pc.in
+@@ -8,5 +8,5 @@ Description: A streaming audio output API derived from mpg123
+ Requires: 
+ Version: @PACKAGE_VERSION@
+ Libs: -L${libdir} -lout123 
+-Libs.private: @LIBOUT123_LIBS@ @LIBDL@
++Libs.private: @LIBOUT123_DEP_LIBS@ @LIBDL@
+ Cflags: -I${includedir} 
+diff --git a/libsyn123.pc.in b/libsyn123.pc.in
+index 7e4ce2ed..60d0a572 100644
+--- a/libsyn123.pc.in
++++ b/libsyn123.pc.in
+@@ -8,5 +8,5 @@ Description: A signal synthesis library accompanying mpg123
+ Requires: 
+ Version: @PACKAGE_VERSION@
+ Libs: -L${libdir} -lsyn123 
+-Libs.private: @LIBSYN123_LIBS@
++Libs.private: @LIBSYN123_DEP_LIBS@
+ Cflags: -I${includedir} 
+diff --git a/src/Makemodule.am b/src/Makemodule.am
+index b894a8aa..14dc8667 100644
+--- a/src/Makemodule.am
++++ b/src/Makemodule.am
+@@ -3,10 +3,26 @@
+ include src/tests/Makemodule.am
+ include src/compat/Makemodule.am
+ if NEED_LIB
++if BUILD_LIBOUT123
+ include src/libout123/Makemodule.am
++LIBOUT123_LINK_LIBS = src/libout123/libout123.la
++else
++LIBOUT123_LINK_LIBS = @LIBOUT123_LIBS@
++endif
+ if NEED_MAINLIB
++if BUILD_LIBMPG123
+ include src/libmpg123/Makemodule.am
++LIBMPG123_LINK_LIBS = src/libmpg123/libmpg123.la
++else
++LIBMPG123_LINK_LIBS = @LIBMPG123_LIBS@
++endif
++
++if BUILD_LIBSYN123
+ include src/libsyn123/Makemodule.am
++LIBSYN123_LINK_LIBS = src/libsyn123/libsyn123.la
++else
++LIBSYN123_LINK_LIBS = @LIBSYN123_LIBS@
++endif
+ endif
+ endif
+ 
+@@ -22,17 +38,17 @@ endif
+ 
+ src_mpg123_LDADD = \
+   src/compat/libcompat.la \
+-  src/libmpg123/libmpg123.la \
+-  src/libout123/libout123.la \
+-  src/libsyn123/libsyn123.la \
++  ${LIBMPG123_LINK_LIBS} \
++  ${LIBOUT123_LINK_LIBS} \
++  ${LIBSYN123_LINK_LIBS} \
+   @PROG_LIBS@
+ 
+ src_mpg123_LDFLAGS = @EXEC_LT_LDFLAGS@
+ 
+ src_out123_LDADD = \
+   src/compat/libcompat.la \
+-  src/libsyn123/libsyn123.la \
+-  src/libout123/libout123.la \
++  ${LIBSYN123_LINK_LIBS} \
++  ${LIBOUT123_LINK_LIBS} \
+   @PROG_LIBS@
+ 
+ src_out123_LDFLAGS = @EXEC_LT_LDFLAGS@
+@@ -46,12 +62,12 @@ CLEANFILES += src/*.a
+ 
+ src_mpg123_id3dump_LDADD = \
+   src/compat/libcompat.la \
+-  src/libmpg123/libmpg123.la \
++  ${LIBMPG123_LINK_LIBS} \
+   @PROG_LIBS@
+ 
+ src_mpg123_strip_LDADD = \
+   src/compat/libcompat.la \
+-  src/libmpg123/libmpg123.la \
++  ${LIBMPG123_LINK_LIBS} \
+   @PROG_LIBS@
+ 
+ src_mpg123_SOURCES = \
+diff --git a/src/libmpg123/Makemodule.am b/src/libmpg123/Makemodule.am
+index 48e3820f..7c64ea68 100644
+--- a/src/libmpg123/Makemodule.am
++++ b/src/libmpg123/Makemodule.am
+@@ -34,7 +34,7 @@ src_libmpg123_libmpg123_la_LDFLAGS = \
+   -export-symbols-regex '^mpg123_'
+ src_libmpg123_libmpg123_la_LIBADD = \
+   src/compat/libcompat.la \
+-  @LIBMPG123_LIBS@
++  @LIBMPG123_DEP_LIBS@
+ src_libmpg123_libmpg123_la_DEPENDENCIES = \
+   src/compat/libcompat.la
+ 
+diff --git a/src/libout123/Makemodule.am b/src/libout123/Makemodule.am
+index fcc5f87d..196b9de6 100644
+--- a/src/libout123/Makemodule.am
++++ b/src/libout123/Makemodule.am
+@@ -55,7 +55,7 @@ src_libout123_libout123_la_LDFLAGS = \
+ src_libout123_libout123_la_LIBADD = \
+   src/libout123/libmodule.la \
+   src/compat/libcompat.la \
+-  @LIBOUT123_LIBS@
++  @LIBOUT123_DEP_LIBS@
+ 
+ if HAVE_MODULES
+ 
+diff --git a/src/libsyn123/Makemodule.am b/src/libsyn123/Makemodule.am
+index d85824fa..ff2a4848 100644
+--- a/src/libsyn123/Makemodule.am
++++ b/src/libsyn123/Makemodule.am
+@@ -18,7 +18,7 @@ src_libsyn123_libsyn123_la_LDFLAGS = \
+ 
+ src_libsyn123_libsyn123_la_LIBADD = \
+   src/compat/libcompat_str.la \
+-  @LIBSYN123_LIBS@
++  @LIBSYN123_DEP_LIBS@
+ 
+ src_libsyn123_libsyn123_la_SOURCES = \
+   src/libsyn123/syn123.h \
diff --git a/media-libs/libmpg123/libmpg123-1.32.3.ebuild b/media-libs/libmpg123/libmpg123-1.32.3.ebuild
new file mode 100644
index 000000000000..c431accb6960
--- /dev/null
+++ b/media-libs/libmpg123/libmpg123-1.32.3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="mpg123"
+MY_P="${MY_PN}-${PV}"
+inherit autotools flag-o-matic toolchain-funcs multilib-minimal
+
+DESCRIPTION="Libraries for realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="https://www.mpg123.org/"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.bz2"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="int-quality cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
+
+# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
+# Note: build system prefers libsdl2 > libsdl. We could in theory add both
+# but it's tricky when it comes to handling switching between them properly.
+# We'd need a USE flag for both sdl1 and sdl2 and to make them clash.
+RDEPEND="
+	dev-libs/libltdl:0
+	!<media-sound/mpg123-1.32.3-r1
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+IDEPEND="app-eselect/eselect-mpg123"
+
+DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
+
+PATCHES=(
+	"${FILESDIR}"/mpg123-1.32.3-build-programs-component.patch
+	"${FILESDIR}"/mpg123-1.32.3-build-with-installed-libs.patch
+)
+
+src_prepare() {
+	default
+
+	# Rerun autotools with patched configure.ac
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local _audio=dummy
+	local _output=dummy
+	local _cpu=generic_fpu
+
+	# Build fails without -D_GNU_SOURCE like this:
+	# error: ‘struct hostent’ has no member named ‘h_addr’
+	append-cflags -D_GNU_SOURCE
+
+	append-lfs-flags
+
+	use cpu_flags_ppc_altivec && _cpu=altivec
+
+	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
+		use cpu_flags_x86_sse && _cpu=x86-64
+	elif use x86 && gcc-specs-pie ; then
+		# Don't use any mmx, 3dnow, sse and 3dnowext
+		# bug #164504
+		_cpu=generic_fpu
+	else
+		use cpu_flags_x86_mmx && _cpu=mmx
+		use cpu_flags_x86_3dnow && _cpu=3dnow
+		use cpu_flags_x86_sse && _cpu=x86
+		use cpu_flags_x86_3dnowext && _cpu=x86
+	fi
+
+	local myconf=(
+		--with-optimization=0
+		--with-cpu=${_cpu}
+		--enable-int-quality=$(usex int-quality)
+		--disable-components --enable-libmpg123 --enable-libsyn123 --enable-libout123
+	)
+
+	multilib_is_native_abi || myconf+=( --disable-modules )
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	if ! $(multilib_is_native_abi) ; then
+		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	mv "${ED}"/usr/bin/mpg123{,-mpg123}
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	eselect mpg123 update ifunset
+}
+
+pkg_postrm() {
+	eselect mpg123 update ifunset
+}
diff --git a/media-libs/libmpg123/metadata.xml b/media-libs/libmpg123/metadata.xml
new file mode 100644
index 000000000000..120fdf73ceb1
--- /dev/null
+++ b/media-libs/libmpg123/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <upstream>
+    <maintainer>
+      <email>thomas-forum@orgis.org</email>
+      <name>Thomas Orgis</name>
+    </maintainer>
+  </upstream>
+  <use>
+    <flag name="int-quality">Use rounding instead of fast truncation for integer output, where possible</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index f42773605b18..3f7ca7df7bc3 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -1,4 +1,5 @@
 DIST libsndfile-1.2.2.tar.xz 730760 BLAKE2B bc8e49983d9ad9dfd98984e2ffef501c6f576480e556e9f9ef91c7d597524cc1bb8baed15dfef8e239f72c42136c524117029eb8271f3a2c9d607fee490279b5 SHA512 a6e3ea3ac5d91befaa99f6a31a3fac44e7b7c11f1de4698167317a461d5a19a2651d47486a920b34400f18367b4f6173bf0c1c9ba80eb682cece1b5beee352a0
+EBUILD libsndfile-1.2.2-r1.ebuild 1777 BLAKE2B 2cf4555c7afc5e60f0ee47870a4bef2d09223eb709abc16ed5033f58243e8ef686f332bdc7e6f903ca449da2ba9c0faae1e618b71d53cff6124c44d4915784ed SHA512 30f2fd703ab54998c813d3a5832aa8dc58102b401f67b5426ae120142b12a66965ef421cbde13cd044b46b38755f9df49658c0cb19e740812d62920d9dce13a2
 EBUILD libsndfile-1.2.2.ebuild 1768 BLAKE2B 1d97619bc09b611d1e3815ee8eb3a5f55ed23934cc0d76c8452d57e6700ec8b0f817915f3e2f8cbb7b0c2f0a09ec08cedcab69d831f4706dde31ab0e8998e9d2 SHA512 4fe4c3c37778b8aaeb695af73fd148c863a51fbf5048b1eb14551a71b7eb8f79b73cbb1e7118cc548168e39d132579fc9705e2564687771ee115f47c9c00a162
-EBUILD libsndfile-9999.ebuild 1775 BLAKE2B bf6c5ce8f34844f936fc7602f8ee16ead80c005e2a97c2d1676f51f50bb4b564a41712b4339e9ecec8ce5e06b8ea57516aa272039a7c36f58395192ba15fc085 SHA512 a4caf7235e53b58235bc7874525f14fe257cb3e1b3bd47b3cd49f61c2e3f995f9ece72ac4c3196f3c0cf87e7d347fd284232d86197defe5052f18973c5b7571a
+EBUILD libsndfile-9999.ebuild 1777 BLAKE2B 2cf4555c7afc5e60f0ee47870a4bef2d09223eb709abc16ed5033f58243e8ef686f332bdc7e6f903ca449da2ba9c0faae1e618b71d53cff6124c44d4915784ed SHA512 30f2fd703ab54998c813d3a5832aa8dc58102b401f67b5426ae120142b12a66965ef421cbde13cd044b46b38755f9df49658c0cb19e740812d62920d9dce13a2
 MISC metadata.xml 340 BLAKE2B 26c245d58463cd3d14645b476de30407e51e47777d36dff251f0f68d9e981e8b6d95cf9aacc51d08feb4f1e550152f38b66d8dae23c40fd1b65702d59044b05a SHA512 54f132b485fc720dc0e1c311370dbc5f7ed4d3a1c8271aafeb9f01fef411df95f0cd55d605debcc3477fcc07aab4b298c240084e70df19a10b1b22c33d57b9c2
diff --git a/media-libs/libsndfile/libsndfile-1.2.2-r1.ebuild b/media-libs/libsndfile/libsndfile-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..617d96799c6e
--- /dev/null
+++ b/media-libs/libsndfile/libsndfile-1.2.2-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/libsndfile/libsndfile.git"
+else
+	SRC_URI="https://github.com/libsndfile/libsndfile/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+inherit python-any-r1 multilib-minimal
+
+DESCRIPTION="C library for reading and writing files containing sampled sound"
+HOMEPAGE="https://libsndfile.github.io/libsndfile/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="alsa minimal sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!minimal? (
+		media-libs/flac:=[${MULTILIB_USEDEP}]
+		media-libs/libogg:=[${MULTILIB_USEDEP}]
+		media-libs/libvorbis:=[${MULTILIB_USEDEP}]
+		media-libs/opus:=[${MULTILIB_USEDEP}]
+		media-sound/lame:=[${MULTILIB_USEDEP}]
+		media-libs/libmpg123:=[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib:= )
+	sqlite? ( dev-db/sqlite )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig"
+if [[ ${PV} == *9999 ]]; then
+	BDEPEND+="
+		sys-devel/autogen
+	"
+fi
+
+src_prepare() {
+	default
+
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-octave \
+		--disable-static \
+		--disable-werror \
+		$(use_enable !minimal external-libs) \
+		$(use_enable !minimal mpeg) \
+		$(multilib_native_enable full-suite) \
+		$(multilib_native_use_enable alsa) \
+		$(multilib_native_use_enable sqlite) \
+		PYTHON="${EPYTHON}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libsndfile/libsndfile-9999.ebuild b/media-libs/libsndfile/libsndfile-9999.ebuild
index 8544de0bdeff..617d96799c6e 100644
--- a/media-libs/libsndfile/libsndfile-9999.ebuild
+++ b/media-libs/libsndfile/libsndfile-9999.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 		media-libs/libvorbis:=[${MULTILIB_USEDEP}]
 		media-libs/opus:=[${MULTILIB_USEDEP}]
 		media-sound/lame:=[${MULTILIB_USEDEP}]
-		media-sound/mpg123:=[${MULTILIB_USEDEP}]
+		media-libs/libmpg123:=[${MULTILIB_USEDEP}]
 	)
 	alsa? ( media-libs/alsa-lib:= )
 	sqlite? ( dev-db/sqlite )"