gentoo auto-resync : 05:01:2024 - 14:04:25

25 files changed, 100 insertions, 650 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 825e54d85cf1..599ee1204541 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index 0a90fc4879ce..de366931c1ba 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,5 +1,5 @@
 DIST abcMIDI-2023.11.26.zip 625787 BLAKE2B f8ab84eaf626bc9a2edb4ac58b2fa2148de58acf8180f4d9118d86d33b3c80f09b66adba6aacb652aeea7bfd8c40b08c8aa3b9048a52957fe4ecf63dce4b81ae SHA512 7f30dcae340a3fd4ee66b1f1802a16404fe880f0d4999de40d468363f2565b86d2f18499f2b8f1fe860055ece99d6efeb889f11b28fc703d7979b0588b1a2df0
-DIST abcMIDI-2023.12.28.zip 628429 BLAKE2B 3d795e74080676cd8a95f37d5e21c2914e72fcf304550a68be3e6ff19e5be824136bf8afeae2244f6e148eabf8a9d02635bbc79bac03c68e94e578f57db4c785 SHA512 c12293ec998528fa06897ca71641e4c4b96c8e504bfec9b02823f491163390ea9c202b2193a5b1a1b3b3b045fec31279f4e8a40da9be478095467910145ecee3
+DIST abcMIDI-2024.01.04.zip 628571 BLAKE2B 2919a0ef33352d2151a97fa003274b9ca8a9b5c047f37e54c29315957377547d4ee59a7846560439640885cc3ec1d1f6ed4d9021577037193557b2176dacfe48 SHA512 9570e802f5b63cb4baa8cb5b8a8a0a892e0305c87aeaad639d331f73f5da080d94bfd7e3c0b222efeb1caaf01839cef8c1764be42cbfe4c9308d56f12f5d8888
 EBUILD abcmidi-2023.11.26.ebuild 676 BLAKE2B 31477b1343585fb2359f83e9bd3073bf381e7c3c58f72255acc221eccb88f56cb8b1312a50a11ebb1d7d922b237743f144178f524cc1bd02d421cefc6afedbcd SHA512 a0a9665494091ae1f38cd72327ab1b6544af3a9368b3c42ca57d23f9370af0f5469db1cc46d2ac0aefd0dc44a91e807249d7ea8b62ad98ba7c339bb75470eaf0
-EBUILD abcmidi-2023.12.28.ebuild 678 BLAKE2B e80a5b9b4ab2b6b2f3a9100a759875547a3971d443d876db558a5abf5a323eb29f03cf318bd6ac2abb429648955d67cfee9bcdbaa43f13bacd2654ec6d1eef72 SHA512 3a687ee6c926bda64ab5b99d072505c88b949dab46b44fa7b34a002eceb8c9394eedd64def057d5ed99fc06b26776d519a88f77821dcd0ab4ca7f97dbafbc2d7
+EBUILD abcmidi-2024.01.04.ebuild 678 BLAKE2B 1f8eccea9c89094128a0a5c6a1f0ad58f3d91ded8ddf8792a232b352b105ba34e9d237f5eb869b1c0e5daed0fdebd07216b5ea1b44f336977096e93db06e700f SHA512 eadb130c315ae5561e82be18ad1a0a49c50e49094df85a0e0f5095ebf99d943e5bb84ea46c8728202266fe90e1fd1e3a3a36665b6ba4838108ecb1f92e72e92d
 MISC metadata.xml 327 BLAKE2B d92d9b40b1c1af1a4ba5cea8b956a098066ae7cc9eab2cb31a0dfbcc37400558f5f35a6ce04a7541ecbea7578906f688d2931c1f62751e5a2d7bb7b80e97cd2f SHA512 170ca99684768ef2d5b0e8a26e6ca64468b3134847ffe53f6a1efb623bfe77a6c09dfd67df553a306af045a47bc69f0d41ceadf508cce7f75f3c2a7614d2d725
diff --git a/media-sound/abcmidi/abcmidi-2023.12.28.ebuild b/media-sound/abcmidi/abcmidi-2024.01.04.ebuild
index 636c9619449a..4d3aaf502473 100644
--- a/media-sound/abcmidi/abcmidi-2023.12.28.ebuild
+++ b/media-sound/abcmidi/abcmidi-2024.01.04.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 31da59d257aa..35aab37f25b3 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,10 +1,9 @@
-AUX clementine-1.4.0_rc2-absl.patch 382 BLAKE2B 7d79b011aa6b1cc54fde671cf294173802fa0ec2eb494e7f54be5c9ebe693247cb809bba3e9a794db6832d8bbb279fbed0c5d7cfacde25b6b28dac32d7756286 SHA512 9a8bbc39248f511dfe616ecdeeaf7e3ac3f92590b4744b19028f3b9038595cad7e2bb2bccbda1c4187cc40813efb68b465a44aea1a25c85ab19710e8173e077e
+AUX clementine-1.4.0_rc2-absl.patch 353 BLAKE2B 8e33c6d539a60294186a674dade27f8220c197e85302ae026ecf54392a4a0ad4ff17f84ba2ef5e5e715bc12913f5dccc2e7b97d911865896c818c9b7bcf69d6f SHA512 b60721a347cd9fd703e1550e39552f0f0d9927130f4abe13122ca760aef78a9b0fcf242178e91f2fca809e98b95f0584095b010283d9e28d4a3b8b6c87cac6dc
 AUX clementine-1.4.0_rc2-c17.patch 2261 BLAKE2B e66117f376b440d359eb40c3247c28ed662b4924e066385792cc3638ae2d0296b52b3c4dc5185507f21c51baac78e063ab79d72bbb7ce2df76e82f5ebffe10c0 SHA512 8a68a23956a08c08a4d7ee030606512f375c2039314268f6f615c424a1b3ab46b643af3afdf221a2d827f03962a1644bd5b1de5d4d70c53b1fd02625fc1026ea
 AUX clementine-1.4.0_rc2-lz.patch 889 BLAKE2B ce04feb2b14c4b1e2e994672c0196100b35672da8b830c3ad1b8103f11327aefbccce97c5ad4253227b88939e16d6a6a88c8b3e3530e8589b1b9e28eb524361c SHA512 4bd24c05dd3d748d6b5f66070900fcef841144baaa8557bdc05a6128ee7b64f7b222344447944ef41d83694ec3f7618fd744d8e6053ec34f35b923b0a3db02a7
 AUX clementine-1.4.0_rc2-projectm-dir.patch 1879 BLAKE2B dc2d19a17b6c255360ae961ff55c6598eae51f0b5b1f4147c8b13541121f8c6dd03d864ba04dbc594ec670c5872e356e3522aaef4f67804b6e7aeb438ec0bb9c SHA512 7d891b9c26dd62b1fdad5548de0976192934aa1a28d25501fb5ba896a81d663243196e076054de6678b69cae3b05df16209c0cfd9ee3b652fe051c7ad4f17a2e
 DIST clementine-1.4.0_rc2.tar.gz 9073685 BLAKE2B a2376f1a895c651c2eb089419e20b9ce6050739f1342a6fdf1ebad0a14b65a08f56cc846eb79ad7facb77d6ee2cac74f9e374bd8e284a2a7f87d7c117779a08d SHA512 403093386efabd52e649c0e379abbf4873c4b2f8d0af72cda2b7e0255f90c60259f961045e7b51d0e5bf35425d678ff6b018c9191845ebbd156d9216d8bd7722
 EBUILD clementine-1.4.0_rc2-r3.ebuild 4507 BLAKE2B 55467d1946ae46f2d23ef2be17b2b01e689861bf62799473d29d520333ea7fa7067293a050e89fe7d084918e3093773db86c352546542a6e4d25df5cf20a7818 SHA512 9dad86b1435b2317cd78cf2e0826ee30d1d62e76e62f73ded349a502a3654678015bdd0d7d8670d2fbdad6e98b3e54b6478a01905e944d83048f7ade48e81a0a
-EBUILD clementine-1.4.0_rc2-r4.ebuild 4624 BLAKE2B fe9f57e729cdb6886636e20b03514cd1eaf51b1152946ee864786af5c1d7bc3c9b555f89948a4a4774f1a89afac39cb1969be7bd4ead9ff808e685f9701ed185 SHA512 8dbbe2b28494267723e406fe4ff06fee619b3aa0388f1a84e9efe196e344680f1abdea1dc256fdae56aa8492d4bb3f68204544dfcba2bec0d5802c95d569af8d
-EBUILD clementine-1.4.0_rc2-r5.ebuild 4679 BLAKE2B 44d0b63e30781d26e2f294077759e5a2eee346c520778ed6a84f51e4198e4696523c2a99a2e90b19222b1cccb2c45231d250b7db63495de1bfdf570a57670317 SHA512 4abf6e3789df683d0d022b4906f4997cb9e164b6fadc4d166844f5a129945c9758c757f65f3cecb2bf7915cdfa7c700a4de94330e7f39973520ce72d271d9f3e
+EBUILD clementine-1.4.0_rc2-r5.ebuild 4782 BLAKE2B 847c860060d38e2c9bfe6b675399945137b6d49b589cb4f58b449eb8c567d389c09a828697b813151059fd350b4b7c76d278263d47f6592735c03bbc25774307 SHA512 9d169857eb8515d5b772d7c2315ee3f84b1a4534f1bd0e58d407958bf1cc76edde4283c71defd12d7b0a490f5e1f1626dcbc33d99900fdc064284a9bb23b2f53
 EBUILD clementine-9999.ebuild 4487 BLAKE2B a37b746a284c0e34f2102ef040b1fc997227733f5ce3b7960baeacf9a2f5386b93869625bcf7fe168cb33b7ad0faafaa4d47a1d7f517f64e4b009221019ae3a0 SHA512 a7b1912add167b7f5a6afb351e32193cc7b2fbd10ed21fd11b3789d7292c53ef5eff1382c3602cf643037842e892e8aef677d7bcf90d5a1e676887826096089e
 MISC metadata.xml 1205 BLAKE2B 385d0f742772f036d1d0e03913aa1e38fe165dfeec7a6773fa5685992f9bbc348437bd759c24c54686d19f8dfbadc8bf208909788bc1e0dd957e47bb659fb832 SHA512 58d908699a52724401f167ae20fa05327aa4fd5b705856a43292c98e898b2f13d11c9db6fac6def35eede0c356071ff38e22883ca233a1005173ded18e69ca92
diff --git a/media-sound/clementine/clementine-1.4.0_rc2-r4.ebuild b/media-sound/clementine/clementine-1.4.0_rc2-r4.ebuild
deleted file mode 100644
index 0ba33dd8074d..000000000000
--- a/media-sound/clementine/clementine-1.4.0_rc2-r4.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
-HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
-
-PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
-
-inherit cmake flag-o-matic plocale virtualx xdg
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/clementine-player/Clementine/archive/refs/tags/${PV/_}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Clementine-${PV/_}"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="alsa box cdda +dbus debug dropbox googledrive ipod lastfm moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	udisks? ( dbus )
-	wiimote? ( dbus )
-"
-
-COMMON_DEPEND="
-	dev-cpp/abseil-cpp:=
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/protobuf:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/chromaprint:=
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
-	>=media-libs/taglib-1.11.1_p20181028
-	sys-libs/zlib
-	x11-libs/libX11
-	alsa? ( media-libs/alsa-lib )
-	cdda? ( dev-libs/libcdio:= )
-	dbus? ( dev-qt/qtdbus:5 )
-	ipod? ( >=media-libs/libgpod-0.8.0 )
-	lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
-	moodbar? ( sci-libs/fftw:3.0= )
-	mtp? ( >=media-libs/libmtp-1.0.0:= )
-	projectm? (
-		media-libs/glew:=
-		>=media-libs/libprojectm-3.1.12:0=
-		virtual/opengl
-	)
-	pulseaudio? ( media-libs/libpulse )
-"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/gst-plugins-soup:1.0
-	media-plugins/gst-plugins-taglib:1.0
-	mtp? ( gnome-base/gvfs[mtp] )
-	udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	dev-libs/libxml2
-	dev-qt/qtopengl:5
-	dev-qt/qtxml:5
-	virtual/glu
-	box? ( dev-cpp/sparsehash )
-	dropbox? ( dev-cpp/sparsehash )
-	googledrive? ( dev-cpp/sparsehash )
-	seafile? ( dev-cpp/sparsehash )
-	skydrive? ( dev-cpp/sparsehash )
-"
-BDEPEND="
-	>=dev-cpp/gtest-1.8.0
-	dev-qt/linguist-tools:5
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (
-		dev-qt/qttest:5
-		gnome-base/gsettings-desktop-schemas
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/clementine-1.4.0_rc2-lz.patch"
-	"${FILESDIR}/clementine-1.4.0_rc2-c17.patch"
-	"${FILESDIR}/clementine-1.4.0_rc2-absl.patch"
-)
-
-DOCS=( Changelog README.md )
-
-src_prepare() {
-	plocale_find_changes "src/translations" "" ".po"
-
-	cmake_src_prepare
-	# some tests fail or hang
-	sed -i \
-		-e '/add_test_file(translations_test.cpp/d' \
-		tests/CMakeLists.txt || die
-
-	if ! use test; then
-		sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
-		cmake_comment_add_subdirectory tests
-	fi
-
-	rm -r 3rdparty/{libmygpo-qt,libmygpo-qt5,taglib} || die
-}
-
-src_configure() {
-	# spotify is not in portage
-	local mycmakeargs=(
-		-DBUILD_WERROR=OFF
-		# avoid automagically enabling of ccache (bug #611010)
-		-DCCACHE_EXECUTABLE=OFF
-		-DENABLE_BREAKPAD=OFF  #< disable crash reporting
-		-DENABLE_GIO=ON
-		-DENABLE_SPOTIFY=OFF
-		-DENABLE_SPOTIFY_BLOB=OFF
-		-DUSE_SYSTEM_GMOCK=ON
-		-DUSE_SYSTEM_PROJECTM=ON
-		-DBUNDLE_PROJECTM_PRESETS=OFF
-		-DLINGUAS="$(plocale_get_locales)"
-		-DENABLE_BOX="$(usex box)"
-		-DENABLE_AUDIOCD="$(usex cdda)"
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
-		-DENABLE_DROPBOX="$(usex dropbox)"
-		-DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
-		-DENABLE_LIBGPOD="$(usex ipod)"
-		-DENABLE_LIBLASTFM="$(usex lastfm)"
-		-DENABLE_MOODBAR="$(usex moodbar)"
-		-DENABLE_LIBMTP="$(usex mtp)"
-		-DENABLE_VISUALISATIONS="$(usex projectm)"
-		-DENABLE_SEAFILE="$(usex seafile)"
-		-DENABLE_SKYDRIVE="$(usex skydrive)"
-		-DENABLE_LIBPULSE="$(usex pulseaudio)"
-		-DENABLE_UDISKS2="$(usex udisks)"
-		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
-		"$(cmake_use_find_package alsa ALSA)"
-	)
-
-	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
-	cmake_src_configure
-}
-
-src_test() {
-	cd "${CMAKE_BUILD_DIR}" || die
-	virtx cmake_build clementine_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
-	elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
-	elog "depending on your preferences"
-}
diff --git a/media-sound/clementine/clementine-1.4.0_rc2-r5.ebuild b/media-sound/clementine/clementine-1.4.0_rc2-r5.ebuild
index 6e37ca03e086..c6a6697e2ccc 100644
--- a/media-sound/clementine/clementine-1.4.0_rc2-r5.ebuild
+++ b/media-sound/clementine/clementine-1.4.0_rc2-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -148,6 +148,7 @@ src_configure() {
 		-DENABLE_UDISKS2="$(usex udisks)"
 		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
 		"$(cmake_use_find_package alsa ALSA)"
+		-DGENTOO_FIX_ABSL_LIBS="$(test-flags-CCLD -labsl_log_internal_check_op -labsl_log_internal_message)"
 	)
 
 	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
diff --git a/media-sound/clementine/files/clementine-1.4.0_rc2-absl.patch b/media-sound/clementine/files/clementine-1.4.0_rc2-absl.patch
index 48eb9dda4227..60c2adff3689 100644
--- a/media-sound/clementine/files/clementine-1.4.0_rc2-absl.patch
+++ b/media-sound/clementine/files/clementine-1.4.0_rc2-absl.patch
@@ -10,6 +10,6 @@ https://bugs.gentoo.org/912853
  target_link_libraries(libclementine-tagreader
 -  ${PROTOBUF_LIBRARY}
    libclementine-common
-+  ${PROTOBUF_LIBRARY} absl_log_internal_check_op absl_log_internal_message
++  ${PROTOBUF_LIBRARY} ${GENTOO_FIX_ABSL_LIBS}
  )
  
diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index ebcbacc0e73d..136d9cd30775 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -1,8 +1,8 @@
 AUX guitarix-0.41.0-nostrip.patch 1355 BLAKE2B 2c21349bc6cb3a93c4e4ac8275917f62c3e874e6a0b2ee726d4531fd2265c1f4d6d8553f9e35f42a277a4f4854c6d9ce38bb1a8070154d3de6bdf6a3e7f73684 SHA512 16ea3c1a14277abf7a5af306d96fb547c7b49f5d552dd67b7997d2fec515884e7e30c1f3150a25ad28bca0726cf8f135c65d7503012ca1d6e841302566ea6c90
-AUX guitarix-0.41.0-py3.11.patch 625 BLAKE2B cc4e06902b893a67b9a3297d15cd71cf5204288ecd83c235ef1af66b60e36cdb475547c12c239c601778ce660e5e055db27563a115d1500c17e337ef25a65400 SHA512 db975cb4186c83125f2116afb50304fe8eccca85e647b61a43ef8703f8c6b0407004745dcbbbc08f3b6ddfa45c3edc46163a41a1acd5cedf8548053cbf7cde08
 AUX guitarix-0.44.1-gcc-13.patch 762 BLAKE2B 33679e1a80ed0f094d71d7525574368a816ec723c5b81974ae600360045a7d748e88a6a08e7f6b15f0b2d7441b6fc431f1ca0cd2bc71fb1abbf51798be949789 SHA512 02c49c0a87f788b781a54c7ff2d0429130dcd93a86fa7fe27f8e55ea444eb31b768b9716de1be28bd59f3f2e4055ec11da5d9d310bdba2ba3b266b013725cff0
+AUX guitarix-0.44.1-py3.11.patch 625 BLAKE2B cc4e06902b893a67b9a3297d15cd71cf5204288ecd83c235ef1af66b60e36cdb475547c12c239c601778ce660e5e055db27563a115d1500c17e337ef25a65400 SHA512 db975cb4186c83125f2116afb50304fe8eccca85e647b61a43ef8703f8c6b0407004745dcbbbc08f3b6ddfa45c3edc46163a41a1acd5cedf8548053cbf7cde08
 AUX guitarix-0.44.1-zita-resampler-1.10.patch 824 BLAKE2B 89a0c980a9f7fa03e4e3de9e34cc6cd4cd07f91bb1702a57e443dfcebf6262213e7da8147c36dec93536f59201d4cf77a8c7f48ae0ca0b5a9bfa023cd9b66d1f SHA512 f889f9a97bd41b9a03a0b9fda4ddabfb7ba36aa847636a1361273ec59d9ad2829ba652f841d2c7dd387545df630ec6b697d0428e7e7da14d2c4d03f7ad292a70
 DIST guitarix2-0.44.1.tar.xz 71754176 BLAKE2B 57a1ad0be133fe2851ff7539d5c467a649774a1de90569e83feeb3ba2b05324ce0ee6d4388122cdb3fdcb36afac4cb7cfd2d6ab0216ff2f56d8e7c2886d14152 SHA512 d2c0e40762d97ed7ce61c3115fc3800cc569a2bb4f66e09147507a9eaa815fb9d1363444353a5854035755bd1b1e247ccb341aed60ca0ecf6a77019da73064c1
-EBUILD guitarix-0.44.1.ebuild 1987 BLAKE2B 9d56946501916190788e76393b9476f3a6e29ead006aa74f5170fe79dc96017bfdddff93cac6254fc393f231eba5c4b8179bf820e5457434aa5cf9ee64a45d75 SHA512 6a5eb65d945c6ecb1114891d74555fc6bfeec73f5da5bcfa14381ff457a3bf6f795befdd23394c6dc8994f15de6cc5a68144cee98ccb914bad8551acef786c7b
-EBUILD guitarix-9999.ebuild 1920 BLAKE2B 1c4fedba09c20ee9ac4f3754bf6c7158ad5dd5dd8d028823d8ee53b398bf560c1bd5ec7c67c2922c3912ab3da848349f516d6599c27a2496d131e6f56723669b SHA512 8e90a60e2dad35663d4fec682b067a818c1766ee22a36d295f4352df26d916cda83df0b5d1c686eab5ba4aea6bbf9d5972d321e9128ce3113fce12f3c950a7f4
+EBUILD guitarix-0.44.1.ebuild 2013 BLAKE2B 226cd350313cd0eaa8424d6d2179d9d0eed45c373ca26896352b96cbbf15291b786bf13c1aa9c30d09f3bd9235dcc29aef02ca992385b8133c5e563205f24684 SHA512 42f33bcfd12ad0c3b5eb57e37bbb3b24830431ee22da043c4c414f89a50a73e42034dc0b08012226970fbd4366663472e3167e77e6956d6d29cf1d4f1e3698ed
+EBUILD guitarix-9999.ebuild 1962 BLAKE2B a1038f45d3aca7835809e87e6baec4102cfac00266e18578df41f6ea9c7588841e7c4009077aee853b0eeb741a6c79e688e0e86bf489e56a93a488e344ee497a SHA512 fae06a32d25c3ae9c29781feabd978f7641fde304d67f4dfdc2e5d8d3108f8c2db794f98760200031510cc64ce2ea50f170ae17318f09c59b3179ea307f8b79c
 MISC metadata.xml 775 BLAKE2B 9d259fec3163a9b8150ed287c8ed803314620ba60c60dd479051ae980d5c25a007b38b2d6712720af834b90ff91c72962d55bb539983001f98bb4ed549511c35 SHA512 6ad0963c139caaffa1b58a60fa30a797b69a7ed74a8924606e60c75b2ae6751954c179ab0ff40a83288c0ad7655c9ed499e38c7bf0a88928e2dcddf5ab6a5826
diff --git a/media-sound/guitarix/files/guitarix-0.41.0-py3.11.patch b/media-sound/guitarix/files/guitarix-0.44.1-py3.11.patch
index f419c2ed7ce7..f419c2ed7ce7 100644
--- a/media-sound/guitarix/files/guitarix-0.41.0-py3.11.patch
+++ b/media-sound/guitarix/files/guitarix-0.44.1-py3.11.patch
diff --git a/media-sound/guitarix/guitarix-0.44.1.ebuild b/media-sound/guitarix/guitarix-0.44.1.ebuild
index 60b76beb379f..7296f64747af 100644
--- a/media-sound/guitarix/guitarix-0.44.1.ebuild
+++ b/media-sound/guitarix/guitarix-0.44.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE='threads(+)'
 
-inherit python-any-r1 waf-utils xdg
+inherit multiprocessing python-any-r1 waf-utils xdg
 
 DESCRIPTION="Virtual guitar amplifier for Linux"
 HOMEPAGE="https://guitarix.org/"
@@ -63,8 +63,8 @@ DOCS=( changelog README )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.41.0-nostrip.patch
-	"${FILESDIR}"/${PN}-0.41.0-py3.11.patch
-	"${FILESDIR}"/${PN}-0.44.1-zita-resampler-1.10.patch
+	"${FILESDIR}"/${P}-py3.11.patch
+	"${FILESDIR}"/${P}-zita-resampler-1.10.patch
 	"${FILESDIR}"/${P}-gcc-13.patch
 )
 
@@ -82,6 +82,7 @@ src_configure() {
 		--no-faust
 		--no-ldconfig
 		--shared-lib
+		--jobs=$(makeopts_jobs)
 		$(use_enable nls)
 		$(usex bluetooth "" "--no-bluez")
 		$(usex debug "--debug" "")
diff --git a/media-sound/guitarix/guitarix-9999.ebuild b/media-sound/guitarix/guitarix-9999.ebuild
index ed2429d53f6d..490d308775b1 100644
--- a/media-sound/guitarix/guitarix-9999.ebuild
+++ b/media-sound/guitarix/guitarix-9999.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE='threads(+)'
 EGIT_OVERRIDE_REPO_ENYOJS_BOOTPLATE="https://github.com/enyojs/bootplate.git"
 EGIT_OVERRIDE_BRANCH_ENYOJS_BOOTPLATE="master"
 
-inherit python-any-r1 waf-utils xdg git-r3
+inherit multiprocessing python-any-r1 waf-utils xdg git-r3
 
 DESCRIPTION="Virtual guitar amplifier for Linux"
 HOMEPAGE="https://guitarix.org/"
@@ -79,6 +79,7 @@ src_configure() {
 		--no-faust
 		--no-ldconfig
 		--shared-lib
+		--jobs=$(makeopts_jobs)
 		$(use_enable nls)
 		$(usex bluetooth "" "--no-bluez")
 		$(usex debug "--debug" "")
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index c3c376be8f68..17de7f839616 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -14,6 +14,6 @@ EBUILD lilypond-2.22.1-r1.ebuild 3290 BLAKE2B 01d01846137ce0dceaf18f48111e017a54
 EBUILD lilypond-2.23.0-r1.ebuild 3169 BLAKE2B 045cac5a2d298d354ce29bc3c8fcbff0d2f823bda6ae8adf343769b3fa56d48d67d458b98cdd3bd1913e57c32a7473bf9d52efab3a19ef13d259904e193e34cc SHA512 be484e2cd71f4d50b124d9f07bf392e9d8bd81cd16f7591d297458d26ddc8885d6634943725b4729bbf1217fa2bfe89769ed4286e30936d4a3ff3c88ec668b2f
 EBUILD lilypond-2.23.2-r1.ebuild 3184 BLAKE2B 5e6eed86581df8a3c82ef0fff2e3ba8b5217a3c3521c376674e0e0511d287a0ba9f46bd6faa80a2c1c72002e6a31b0b94ed5d036652d766065067616e0390abc SHA512 9090401ac88a635445adeb1dd75f006aa3da92ab023eb8a810aeabe55f528d703f9e188e512ccfcc1e95af736a82c2e75521adcd0417d1797eb9a1cf88ce8461
 EBUILD lilypond-2.24.0.ebuild 2968 BLAKE2B c6d82afcd6057649f5b2f53f1f3b8af3c4f45edd589da04a757126c28a699868cd38db56b7aeb10cd399dd0967db734f2c43f73c2c870f21afb5705d129618d7 SHA512 240a82b52ba82cd604371baf9b717419aa53dc3bc1d53eeb51efe0b0ef306ca93b40f8a486612864d8ee5647467fd58467fb65b4140bc1d048cd6c475d9a07d5
-EBUILD lilypond-2.24.3.ebuild 3240 BLAKE2B 6af61570e6c5711324a761ee8ea4e934743ada450b47ddde418942dd7a9aef977c2b456d3f583938841b646aaf8797616961a17ccccb81b4b5a0af5cbecad857 SHA512 a2ef3c667ba2683e3b20500565baabb0f66d896d9b5de69a9974943c47fe0059fe705a36a98df35d2566a833f17e79238501cee3a7da504d5f0ba56674e25aca
+EBUILD lilypond-2.24.3.ebuild 3237 BLAKE2B b3bf2e183338b6216f3b5096b86e4fc857cc2c48bfed167c0786bd2a3f9c5af650da674735eda7fe1c5a96adad1b9c1d74f452336518e825abba60e678e45b25 SHA512 a1c4c84cab6c75abba0994c00eaa389043efc85a0965e7bab17f882fa4b7a1c35620c19f5ae17e2b67aa260fb67b748ac3fb109cdc0b76839090c3ffddce65bf
 EBUILD lilypond-9999.ebuild 3240 BLAKE2B 6af61570e6c5711324a761ee8ea4e934743ada450b47ddde418942dd7a9aef977c2b456d3f583938841b646aaf8797616961a17ccccb81b4b5a0af5cbecad857 SHA512 a2ef3c667ba2683e3b20500565baabb0f66d896d9b5de69a9974943c47fe0059fe705a36a98df35d2566a833f17e79238501cee3a7da504d5f0ba56674e25aca
 MISC metadata.xml 527 BLAKE2B b110a46a24ff9f9f8b93e28a17c40ff7d0674e9162e7804b476e9568fc4ddd1afd9c7386a129e9b2c3adf2010221e463cf0a32c720edda7fa31feb8ce806f5d0 SHA512 1f5cb81806c3155895a5a3a2b773c3ebbbfb35d7cafdb37b96961a46f6db11762a25444a868af975183b386bcc8dd8bf665e082a65d1c8423b224ea3185b31cd
diff --git a/media-sound/lilypond/lilypond-2.24.3.ebuild b/media-sound/lilypond/lilypond-2.24.3.ebuild
index 67c1d3818dfc..374b0e585c6e 100644
--- a/media-sound/lilypond/lilypond-2.24.3.ebuild
+++ b/media-sound/lilypond/lilypond-2.24.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	MAIN_VER=$(ver_cut 1-2)
 	SRC_URI="https://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~riscv x86"
 fi
 
 DESCRIPTION="GNU Music Typesetter"
diff --git a/media-sound/mpg123-base/Manifest b/media-sound/mpg123-base/Manifest
new file mode 100644
index 000000000000..810b95cc0e9d
--- /dev/null
+++ b/media-sound/mpg123-base/Manifest
@@ -0,0 +1,3 @@
+DIST mpg123-1.32.3.tar.bz2 1111054 BLAKE2B 67f889403c2bb639d675ec5ebea5a19c4b7174971d62bdd8d940ad659e6b0c06dada38422fc9d71b878917aa89e305ec48c8faa78d65d507cd6a0c9a79951359 SHA512 946c1073b6eebfd65333ec543df1caeea25864479e9c8e153fb53d8b636cc756d8d81947f7b5cbedbbfb1ea664d3fb27562ed36e7726d95e80591bd2ad622afc
+EBUILD mpg123-base-1.32.3.ebuild 2943 BLAKE2B 13a1cc67514adbf35ce73d4b7f1256730875d3d8609040272f5733af759bafe6b363e7794e925c846d90af245b684806f4fcca14e9640c26df8b249cf5c4bb48 SHA512 40db4e77abbabc62df879b647b0302ae78e98eca3d327d2856d801a052662ce77f0ae5e48f3a3f7e501db9bfe6d21b15fec00b77a87cc0285ed5a23c84157030
+MISC metadata.xml 579 BLAKE2B e61622166d7240119fcdb5f79d5b228b5fef1086e818a3c5dce16d70f290b621a8c48efff36ff93d60cb63014e4d33db8401a902cdcc26d2779464788e735cb5 SHA512 f546df9ffe7d486a0f9450f86d531a48227820c597cb60216c61f589478fb312c1c1026deb90929feeb4b6804443ead310dbf1fdc3d1739a13220155c5523707
diff --git a/media-sound/mpg123-base/metadata.xml b/media-sound/mpg123-base/metadata.xml
new file mode 100644
index 000000000000..d86d05aa1cec
--- /dev/null
+++ b/media-sound/mpg123-base/metadata.xml
@@ -0,0 +1,18 @@
+<?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>
+    <remote-id type="sourceforge">mpg123</remote-id>
+  </upstream>
+  <use>
+    <flag name="int-quality">Use rounding instead of fast truncation for integer output, where possible</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-sound/mpg123/mpg123-1.32.3-r1.ebuild b/media-sound/mpg123-base/mpg123-base-1.32.3.ebuild
index 5cfc46c492f1..5b38b5b112cf 100644
--- a/media-sound/mpg123/mpg123-1.32.3-r1.ebuild
+++ b/media-sound/mpg123-base/mpg123-base-1.32.3.ebuild
@@ -3,30 +3,30 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic multilib-minimal
+MY_PN="mpg123"
+MY_P="${MY_PN}-${PV}"
+inherit flag-o-matic toolchain-funcs libtool multilib-minimal
 
 DESCRIPTION="a 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/${PN}/${P}.tar.bz2"
+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="alsa coreaudio int-quality ipv6 jack nas oss portaudio pulseaudio sdl"
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl 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="
-	~media-libs/libmpg123-${PV}[${MULTILIB_USEDEP},int-quality?]
+	!<media-sound/mpg123-1.32.3-r100
+	!media-libs/libmpg123
 	dev-libs/libltdl:0
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-	nas? ( media-libs/nas )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-libs/libpulse )
-	sdl? ( media-libs/libsdl2 )"
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	sys-devel/libtool
@@ -36,25 +36,16 @@ 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
-
-	# Upstream already applied the change to move shared internal implementation headers
-	# for next release, we just move them by hand now to fix build with patched sources.
-	mv src/libmpg123/{abi_align.h,debug.h,sample.h,swap_bytes_impl.h,true.h} src/ || die
+	elibtoolize # for Darwin bundles
 
 	# Rerun autotools with patched configure.ac
-	eautoreconf
+	#eautoreconf
 }
 
 multilib_src_configure() {
-	local _audio=dummy
-	local _output=dummy
+	local _audio=
 	local _cpu=generic_fpu
 
 	# Build fails without -D_GNU_SOURCE like this:
@@ -65,25 +56,39 @@ multilib_src_configure() {
 
 	if $(multilib_is_native_abi) ; then
 		local flag
-		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
+		for flag in coreaudio pulseaudio jack alsa oss sdl portaudio nas ; do
 			if use ${flag}; then
 				_audio+=" ${flag/pulseaudio/pulse}"
-				_output=${flag/pulseaudio/pulse}
 			fi
 		done
 	fi
 
+	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-audio="${_audio}"
-		--with-default-audio=${_output}
+		--with-audio=dummy
+		--with-default-audio="${_audio} dummy"
+		--with-cpu=${_cpu}
 		--enable-network
 		$(use_enable ipv6)
-		--disable-components
+		--enable-int-quality=$(usex int-quality)
 	)
 
 	multilib_is_native_abi || myconf+=( --disable-modules )
-	multilib_is_native_abi && myconf+=( --enable-libout123-modules --enable-programs )
 
 	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index be4e33eb350a..e018935f588f 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,6 +1,4 @@
-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 mpg123-1.32.3-r1.ebuild 2987 BLAKE2B 30ce2727a04dec2c71374b0fa083d36d4aa580aa2fa1cf341f5ad6b00de0923fa57e7b897549b191cde8406c181935c5a0a8f281371f43fdd09ad2de319424a0 SHA512 2bdcbd9f5bb19466fc566009e6a273082784bca82e337cc7955013f537296dec4fce86098585b242bc78c9d81bbb69d147b8fc1fd96efd5e735193124a0867ee
+EBUILD mpg123-1.32.3-r100.ebuild 770 BLAKE2B 54c3b2dedc04a4905e49d1e7f5c9c930f15e06eae1a161e3bef69e173b40e51d077ae912f7c9753abc2595f510a4e09f094d3cae778220054eeae53e4a61d11e SHA512 e61e2fdd62faa1b6d055dea9da07e967061e348d55cec7404cb0547de6a1c48070c420b8850d50d5fd92e1152ba622bcadc1d1fa56d9b3d55ad2bcfbe60a900e
 EBUILD mpg123-1.32.3.ebuild 2988 BLAKE2B 57017403a9889d0cbb6df65215d1c1d7a0094a2ddf356bc10ef882ab181ac9785b0d3f708e0af428705490a3c62613163ae1b7a8713f4f58403fb0bd0d7980be SHA512 9c55b8ccb6b2b13e454cd562f76b86051c7d217c6ec2e9c88595422977c7e5054b2cba40a35fa1a95f0350b71f333d6c67aecf2e22ac7dcff29ad8d6a261c138
 MISC metadata.xml 526 BLAKE2B 42eed8f068420cefea4cf3e75a880889be7abe182feec2aa95e0e7f550cf68eb2582460e43500d24b7ad189adb3e0e135da1079efb405957fe3dfc6b93a91ece SHA512 11e572b6ec77d6c971766e666db84ee4b605479c3f89ba639177de7fb109a8d9e38d1f5034a52554736e6bd0915aae84830169ba3580f6d64794adc4c8cb9d0e
diff --git a/media-sound/mpg123/files/mpg123-1.32.3-build-programs-component.patch b/media-sound/mpg123/files/mpg123-1.32.3-build-programs-component.patch
deleted file mode 100644
index ea20c8a445f6..000000000000
--- a/media-sound/mpg123/files/mpg123-1.32.3-build-programs-component.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-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-sound/mpg123/files/mpg123-1.32.3-build-with-installed-libs.patch b/media-sound/mpg123/files/mpg123-1.32.3-build-with-installed-libs.patch
deleted file mode 100644
index aec0ef87ebbf..000000000000
--- a/media-sound/mpg123/files/mpg123-1.32.3-build-with-installed-libs.patch
+++ /dev/null
@@ -1,252 +0,0 @@
-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-sound/mpg123/mpg123-1.32.3-r100.ebuild b/media-sound/mpg123/mpg123-1.32.3-r100.ebuild
new file mode 100644
index 000000000000..d63f9e37d2a4
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.32.3-r100.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="A meta package for realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="https://www.mpg123.org/"
+SRC_URI=""
+
+LICENSE="metapackage"
+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="alsa coreaudio jack nas oss portaudio pulseaudio sdl"
+
+RDEPEND="
+	media-sound/mpg123-base[${MULTILIB_USEDEP},alsa?,coreaudio?,jack?,nas?,oss?,portaudio?,pulseaudio?,sdl?]
+	media-plugins/mpg123-output-plugins[alsa?,coreaudio?,jack?,nas?,oss?,portaudio?,pulseaudio?,sdl?]
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"
diff --git a/media-sound/xfmpc/Manifest b/media-sound/xfmpc/Manifest
index 8c7881834ba1..89acb90f4179 100644
--- a/media-sound/xfmpc/Manifest
+++ b/media-sound/xfmpc/Manifest
@@ -1,3 +1,3 @@
 DIST xfmpc-0.3.1.tar.bz2 455660 BLAKE2B 2391217f1695ab0962a3ee52ea27ef44febbd8cf982d1bfba0c6952423c718f32dbea590930b9cef9cd3d932b2297cafb87870e27fb7579a764ad948e62918d6 SHA512 771835828cd89298d79c31cec2716b308889e6b835a2b16d0ef25eab6ed1667b055158f845ebf897df8f3f9f45a07fb6ad2994a9981695e74be2d56408e4abe0
-EBUILD xfmpc-0.3.1.ebuild 761 BLAKE2B 15835b6d47c9e4a608f63894a095573a2c33daf436419017b8cedfb0a89277e78838e79588eedf36bd2ae661fdd0ff64188d500dd4e9dd1c22705c6fcb5ece61 SHA512 423dee1965b22865635bd17828024efcbee742580152f38cf0f0a546ce16660e78dddf399932a04607ed1ec810746b629e520e990d03c795e5110b3b7e0604e5
+EBUILD xfmpc-0.3.1.ebuild 768 BLAKE2B d99533494ad614bde749500a862d6ec8519cf55d9d81f2293dda50091ec43e56d6480c6db87d61f98b2ebcedaa13b40f24cd5c4873f19cfcd77fd180bc79755e SHA512 0a514c2afeb224370c07b36bb699f23b644c67850e183a6e9f2d1ea37685885d554e3b5a3e9f16cd551c0b94d2c511b5a6e3ca8dca9904458717927fd42eb797
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/media-sound/xfmpc/xfmpc-0.3.1.ebuild b/media-sound/xfmpc/xfmpc-0.3.1.ebuild
index ae1a39537c81..9590fa9c3c7d 100644
--- a/media-sound/xfmpc/xfmpc-0.3.1.ebuild
+++ b/media-sound/xfmpc/xfmpc-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 DEPEND="
 	>=dev-libs/glib-2.38.0:2=
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index 99bf61cee21b..50d13317dae9 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,7 +1,3 @@
-DIST yoshimi-2.2.3.tar.gz 8067566 BLAKE2B 6aadaa08dafc83e7b5eaec88d53ba27fa923012b4ceaa0acd49dc82bd6aa9b255a17477c950fc9ab97ca0c08e8bf1a2f655f24aca28e1d762ea85fc92da0ca42 SHA512 d10829bcc81999c359912c76a1cbdeba4dbc5a31dbca3c54bd31323495c6ae889d50342d8024929076976b7b6deb1dc7829fbd19f9f3618caf2517a014aeccbe
-DIST yoshimi-2.3.0.tar.gz 8765797 BLAKE2B 3c415c4e0460a5a625eda3cd50324cd234f8c1b3c69fe46e01af6a5c3c7b896caba1f4950148bff35433a616163722913db213b2c40b84eba6956213e8ec86fb SHA512 a5ff3234a1cfa6fefe93eb1088b61e939fb2d89636dacb6ee7f5082532cc0bc04a701d6326b61a3d7d7ba3f4bd58acbf4cc806e9a693f4b89a6db1a8192d872c
 DIST yoshimi-2.3.1.3.tar.gz 8695976 BLAKE2B 1611756162cf77f1b512f41932e84d554b66567fa55f715c375458736e07cf3c248bfb6d2dc9f1f4ca89ca83b86aee97051e6a04391de2fe0797c488997333ed SHA512 5c8dd0fc7207d3356bbc5c5eae80a0ba9699fe5e6ff79eb889bf44be430e48e4bb959a43a88287e7e867f778e8870dc11927860b213e6bfd72a0309a77e15bb7
-EBUILD yoshimi-2.2.3.ebuild 1193 BLAKE2B 3068dd47f972f25c3bd1b9d3ae5dae8384e8894927f2fe3572713e65a20c230e393995bfb68e9c3740ed224078cc58a9d9e07f9aa3f40ae86b441665c8032cc8 SHA512 bcf582f391ec088047c4a65fa7cb553ee1a946fb959e54c79d45730dd1d85630d08686d24ed9d7cb09f2a4422dcf5acbcb7a0e1f8f1f65cbe140b107c357933e
-EBUILD yoshimi-2.3.0.ebuild 1193 BLAKE2B 3068dd47f972f25c3bd1b9d3ae5dae8384e8894927f2fe3572713e65a20c230e393995bfb68e9c3740ed224078cc58a9d9e07f9aa3f40ae86b441665c8032cc8 SHA512 bcf582f391ec088047c4a65fa7cb553ee1a946fb959e54c79d45730dd1d85630d08686d24ed9d7cb09f2a4422dcf5acbcb7a0e1f8f1f65cbe140b107c357933e
 EBUILD yoshimi-2.3.1.3.ebuild 1003 BLAKE2B 7e367f13cd07e04424ab517de20dd30a464ff30cadbaf440291f672007a91ae9a99e60971e4e6e7e757dc48cb264adeb64c0a71f7b9ccb7f6ed9861d2cc52bad SHA512 b2ba017fe458e31210a4208f84b73a57e38c74a3f7004c3f2c463e91122e3e0b9aa6b436343b9a25bfda05a7982f7686a97f8bc8dd88ce7be965c20140cf120e
 MISC metadata.xml 1414 BLAKE2B 4dab154682ec4f0dfe9f4ee1f2b1510f020ef9bf8ce8b871c7bae3709a505faff8e07a2af20cedc3de357dd01c5a2bc192b2776153c1fb028894db732e0215dc SHA512 0ae6d64001643cc80c58929a4d28af6c3c4e0433b31567091e495dd34c350f7fa8908bf89d9aea1b3f004b40e7c8b60ec36025d04fa510f93af17f2316833c61
diff --git a/media-sound/yoshimi/yoshimi-2.2.3.ebuild b/media-sound/yoshimi/yoshimi-2.2.3.ebuild
deleted file mode 100644
index ed78b51a5609..000000000000
--- a/media-sound/yoshimi/yoshimi-2.2.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="Software synthesizer based on ZynAddSubFX"
-HOMEPAGE="https://yoshimi.github.io/"
-SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+lv2"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	dev-libs/mxml
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/libsndfile
-	sci-libs/fftw:3.0=
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	virtual/jack
-	x11-libs/cairo[X]
-	x11-libs/fltk:1[opengl]
-	lv2? ( media-libs/lv2 )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-DOCS=( ../Changelog ../README.txt )
-
-src_prepare() {
-	cmake_src_prepare
-	sed -e "/^install.*doc.*DATAROOTDIR/s/${PN}/${PF}/" -i CMakeLists.txt || die
-	append-cxxflags -lpthread
-	append-cppflags -lpthread
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLV2Plugin=$(usex lv2)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# unpack Histories.tar.bz2 to avoid QA issues
-	pushd "${ED}/usr/share/doc/${PF}" || die
-	tar xvf Histories.tar.bz2 || die
-	rm Histories.tar.bz2
-	popd
-}
diff --git a/media-sound/yoshimi/yoshimi-2.3.0.ebuild b/media-sound/yoshimi/yoshimi-2.3.0.ebuild
deleted file mode 100644
index ed78b51a5609..000000000000
--- a/media-sound/yoshimi/yoshimi-2.3.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="Software synthesizer based on ZynAddSubFX"
-HOMEPAGE="https://yoshimi.github.io/"
-SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+lv2"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	dev-libs/mxml
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/libsndfile
-	sci-libs/fftw:3.0=
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	virtual/jack
-	x11-libs/cairo[X]
-	x11-libs/fltk:1[opengl]
-	lv2? ( media-libs/lv2 )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-DOCS=( ../Changelog ../README.txt )
-
-src_prepare() {
-	cmake_src_prepare
-	sed -e "/^install.*doc.*DATAROOTDIR/s/${PN}/${PF}/" -i CMakeLists.txt || die
-	append-cxxflags -lpthread
-	append-cppflags -lpthread
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLV2Plugin=$(usex lv2)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# unpack Histories.tar.bz2 to avoid QA issues
-	pushd "${ED}/usr/share/doc/${PF}" || die
-	tar xvf Histories.tar.bz2 || die
-	rm Histories.tar.bz2
-	popd
-}