gentoo auto-resync : 19:02:2023 - 08:13:24

5 files changed, 44 insertions, 107 deletions

diff --git a/app-emulation/faudio/Manifest b/app-emulation/faudio/Manifest
index 022820046535..5cac8f2fc894 100644
--- a/app-emulation/faudio/Manifest
+++ b/app-emulation/faudio/Manifest
@@ -1,5 +1,6 @@
 AUX faudio.pc 245 BLAKE2B 8231bb42f6d90dd814eabd12d4d582d74ea0f154d6913fa710814d1bd75168d667463fd430d827ac7854aaa76bc07d16e5ccb3f6455e990ae0e2bc21bc633291 SHA512 bbdce2d90fcf848b8ef6a7a47a5bdf535d261aa833d6821de21907be05cca8693fede48c0e4161ae8087522297a2ec5af8c5ff5ed42efb814bbbc195ff963059
 DIST FAudio-21.01.tar.gz 1134752 BLAKE2B 3acf80172744bfdc6fb44e373ee2a159ed4d49713fec38a8c6447d66c345445a435e1eb1656552289a634e3a628cfcf7df979a2d155edca1aef0c0334629424e SHA512 69405a28fdf3ff5026992bdd1d40d61653b834dac3ef2697a0e794deac2fa6257fe74b19d2fe225ce25a1ae3caec7082106f5ab6ea6109cc61e520b903d35b80
-EBUILD faudio-21.01.ebuild 2424 BLAKE2B 39fc50512ff4bf018d0cfdf734d64a304648d9c2e0d55cba6284a34753337dd40eb6e0f85d9e0851f7ba16838044dcd5cd33e0ffe331b9aae5aa41c3388a1f3f SHA512 a5e5f89a50503208ce664d9e57ebf757376d477a0769673a85be27fb4fa0aa739ab8b04b5b5c0c36e91f2b6f5c66c3422f08556163cf0148931f02b392cd1651
-EBUILD faudio-9999.ebuild 2426 BLAKE2B ed4e0a8730cfe0bcfb2f08654f6e3f42395ecafc7d372cf8aad7018c8e1928b24cd70f6eaa8d3adb3e554e1d80653c929c9a3610b466ecad76adc62f1806d2d3 SHA512 169b8dc0d6f77cdcbccb5dffd7c093c07d25c555aead11657936cbef3fd37b9d54134177a1d0f220eea377dd3dbbfc6a2fef6a1a8e47c942c07db14b38899938
-MISC metadata.xml 1272 BLAKE2B 516f62ffd37851aeb0d313e7229a3b239c41028265526590e2b8d5f1c0c156b7457e3f61886023288e92482d02b8526e62596f054614d906d3dfae302bc4a185 SHA512 8789bd79763e5d8a57dc39e7554a196dab038b6ffda2bffb88d03997b2e53772c1d1a77bb4b2cd98afeadbc31203a3f484a3ada111a7252a23765834a3bae2ed
+DIST faudio-23.02.tar.gz 1111012 BLAKE2B c776a5b882697fbbed894f129165600b1aad8b303254e9ecbf6111fff71581491b484681a71d377854077dfc23b99d1217e5322bdd9923caf4471cc0bc2ca0f2 SHA512 d83adca1f1e42b1c7d63dad30886b58a914ac9a5a254f26d3fdb2386776840e3c40b22a8dd9c7172e6c97b0db989f919fd2ebeac2ec00075a8136ec9120bc390
+EBUILD faudio-21.01.ebuild 2415 BLAKE2B a78373daeb83ec59a3d6d4b68b6c5f4f195c6565c5ca18876e470350665ea6af3d7f76fa29ac21f9dd2a64016c95456ceb01ccd12506e8164e9b058d0206c0e3 SHA512 be6fde85f81525e05fd63b54296d0595a4ddeb8dff0cf17bf47d37efab626d030e90f5b72b0aaefc6d1b577470d79de413c30d4fecefeae1e1aeb28417c1a9f3
+EBUILD faudio-23.02.ebuild 922 BLAKE2B 7b046cb8268bacd98354d8405eab2279fbf488813e38f907d47aaa988d9c1466b385e59e3c180f33c4ffb24758c18d15351ff8dee53ee6c17a081229178be6cc SHA512 fc3ba0b870a34708391f3a6689d977a2072f2e3f77f042678805644861480d95560315facc4690cef7360ccbd43b062b25d774f9378a9d21cd5e12d12a03ce74
+MISC metadata.xml 1002 BLAKE2B 6ce06fb03b7ac5780117a9df9ee6e1178b96192c7b83837208e368cb2686b826c9cd865fdda3b56ca83c9d4adf28af5e902c369af1ca6f403ebfcf971350696b SHA512 0ce37f2f241600a3cde2319e45afc6a96de0d133699f136007eb3e1ecf6fac14a5b3274fd3c60a147940e195a05472e895bb24aceb893d87178413258d4c9082
diff --git a/app-emulation/faudio/faudio-21.01.ebuild b/app-emulation/faudio/faudio-21.01.ebuild
index 7da4264317ac..9a672a9e23d1 100644
--- a/app-emulation/faudio/faudio-21.01.ebuild
+++ b/app-emulation/faudio/faudio-21.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # shellcheck disable=SC2034
@@ -22,7 +22,7 @@ else
 	S="${WORKDIR}/${FAUDIO_P}"
 fi
 
-DESCRIPTION="FAudio - Accuracy-focused XAudio reimplementation for open platforms"
+DESCRIPTION="Accuracy-focused XAudio reimplementation for open platforms"
 HOMEPAGE="https://fna-xna.github.io/"
 LICENSE="ZLIB"
 SLOT="0"
diff --git a/app-emulation/faudio/faudio-23.02.ebuild b/app-emulation/faudio/faudio-23.02.ebuild
new file mode 100644
index 000000000000..2a14e9db9d2c
--- /dev/null
+++ b/app-emulation/faudio/faudio-23.02.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Accuracy-focused XAudio reimplementation for open platforms"
+HOMEPAGE="https://fna-xna.github.io/"
+SRC_URI="https://github.com/FNA-XNA/FAudio/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/FAudio-${PV}"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug dumpvoices test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="media-libs/libsdl2[sound]"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	append-cppflags -D_DEFAULT_SOURCE # usleep() in tests
+	use debug || append-cppflags -DFAUDIO_DISABLE_DEBUGCONFIGURATION
+
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+		-DDUMP_VOICES=$(usex dumpvoices)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	einfo "Running faudio_tests, this may take some time without output..."
+	SDL_AUDIODRIVER=dummy "${BUILD_DIR}"/faudio_tests || die
+}
diff --git a/app-emulation/faudio/faudio-9999.ebuild b/app-emulation/faudio/faudio-9999.ebuild
deleted file mode 100644
index e767f198d064..000000000000
--- a/app-emulation/faudio/faudio-9999.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# shellcheck disable=SC2034
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-
-inherit cmake-multilib virtualx multilib-build
-
-FAUDIO_PN="FAudio"
-FAUDIO_PV="${PV}"
-FAUDIO_P="${FAUDIO_PN}-${FAUDIO_PV}"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/FNA-XNA/${FAUDIO_PN}.git"
-else
-	SRC_URI="https://github.com/FNA-XNA/${FAUDIO_PN}/archive/${FAUDIO_PV}.tar.gz -> ${FAUDIO_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${FAUDIO_P}"
-fi
-
-DESCRIPTION="FAudio - Accuracy-focused XAudio reimplementation for open platforms"
-HOMEPAGE="https://fna-xna.github.io/"
-LICENSE="ZLIB"
-SLOT="0"
-
-IUSE="+abi_x86_32 +abi_x86_64 debug dumpvoices gstreamer xnasong test utils"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
-
-DEPEND="
-	>=media-libs/libsdl2-2.0.9[sound,${MULTILIB_USEDEP}]
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-	)
-"
-RDEPEND="${DEPEND}"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		"-DCMAKE_INSTALL_BINDIR=bin"
-		"-DCMAKE_INSTALL_INCLUDEDIR=include/${FAUDIO_PN}"
-		"-DCMAKE_INSTALL_LIBDIR=$(get_libdir)"
-		"-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)"
-		"-DFORCE_ENABLE_DEBUGCONFIGURATION=$(usex debug ON OFF)"
-		"-DBUILD_TESTS=$(usex test ON OFF)"
-		"-DBUILD_UTILS=$(usex utils ON OFF)"
-		"-DDUMP_VOICES=$(usex dumpvoices ON OFF)"
-		"-DGSTREAMER=$(usex gstreamer ON OFF)"
-		"-DXNASONG=$(usex xnasong ON OFF)"
-	)
-	cmake_src_configure
-}
-
-src_configure() {
-	cmake-multilib_src_configure
-}
-
-multilib_src_compile() {
-	cmake_build
-	emake -C "${BUILD_DIR}" all
-}
-
-multilib_src_install() {
-	# FIXME: do we want to install the FAudio tools?
-	cmake_src_install
-
-	sed -e "s@%LIB%@$(get_libdir)@g" -e "s@%PREFIX%@${EPREFIX}/usr@g" \
-		"${FILESDIR}/faudio.pc" > "${T}/faudio.pc" \
-		|| die "sed failed"
-	insinto "/usr/$(get_libdir)/pkgconfig"
-	doins "${T}/faudio.pc"
-
-	if use test; then
-		mkdir -p "${T}/$(get_libdir)" || die
-		cp "${BUILD_DIR}/faudio_tests" "${T}/$(get_libdir)/" || die "cp failed"
-	fi
-}
-
-faudio_test() {
-	XDG_RUNTIME_DIR="/run/user/0" virtx "${T}/$(get_libdir)/faudio_tests"
-}
-
-pkg_postinst() {
-	use test || return
-
-	# FIXME: FAudio tests are broken and also don't appear to work
-	# in the Portage sandbox.
-	multilib_foreach_abi faudio_test
-}
diff --git a/app-emulation/faudio/metadata.xml b/app-emulation/faudio/metadata.xml
index 697202e2f1d7..f191d2253d7a 100644
--- a/app-emulation/faudio/metadata.xml
+++ b/app-emulation/faudio/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>wine@gentoo.org</email>
-		<name>Wine</name>
-		<description>
-			This package must be kept in sync with repo/proj/wine repository.
-			Any changes need to be run past the maintainer to ensure the two repositories are kept in sync.
-		</description>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 FAudio, is an XAudio reimplementation that focuses solely on developing fully accurate DirectX Audio runtime libraries
 for the FNA project, including XAudio2, X3DAudio, XAPO, and XACT3.