gentoo resync : 16.06.2019

3 files changed, 2 insertions, 99 deletions

diff --git a/app-emulation/faudio/Manifest b/app-emulation/faudio/Manifest
index 15d7325cb67d..869e78ce8967 100644
--- a/app-emulation/faudio/Manifest
+++ b/app-emulation/faudio/Manifest
@@ -1,9 +1,7 @@
 AUX faudio.pc 241 BLAKE2B 64fce2341df51cf608407d22953bcfdaac705f9031fe060eef9b9d45cf4eee5f8a5d747be76f0c68bbea5d3bda6aec5ca8fee6568a7355a90f95f04ef47531a2 SHA512 78ade9bf6b45ac0f942485844b023c2bc11dd77e72484da0260ce59a2dce6f9a70443ba4a64004d35b24b79688e03b6406e85fd7ed835e5952e1f50d1a9193ff
-DIST FAudio-19.01.tar.gz 885398 BLAKE2B 00b9c05cf67ed540a503937184d1c05faa957765c903473f94fddb0aa467efe79d90eb6f4fc88f61376849126104096e4b1204a6de6a31a74368cb991e8e44c0 SHA512 59447368eae94fc8a4bc1724a826bb4d8d53f65e4e5efa1f68fe0f7ea168f2c139e775975d93b26180b687cfb7419ec04bd2b285142a1fddb59e9575cc53e375
-DIST FAudio-19.02.tar.gz 885974 BLAKE2B f8b2402f4005125c583637482a595da9f1a05ffb8c2836498fa5abed1bdae17aa1f1c2c28eb58e0e311bc82f47d48bcb3c626801942f18ecac2eab46c5913e3b SHA512 f3ea82aae5f90bbac286b8e72c1cb6a70e41fdf86f9c1043b465cb242f1232574e59e0ec724f3c317ed4c44a12d4dde87c8b1bc03832e1b011b4e61d9f70da39
 DIST FAudio-19.03.tar.gz 886621 BLAKE2B 0cf0b60766d48472c72dc2aa9bbdb9a99db27836f38eccacb4be4bd98cf387b6009998018438e46835a9b9616d426b8a2c9f3c200b377bce2dc9bc18e42b0d37 SHA512 94e3e4f3f023879ef821d657e5a73ac25aab55c7be6a0afe77d75cabe644c9da083ae3c6a240b71af542da53a3eb34804e6a3193a0e619f89fcc20ff7d6ef095
-EBUILD faudio-19.01.ebuild 2399 BLAKE2B 2d8340562b9215a947b77de1af488c63a765ec654e73c5638cf7fab715f28a8067aad98c32bb8e0856d663f6ea9bc04f0af6bf78286b35f9685296bc53411a0c SHA512 b786b10dc4156c815fc1189add4afbbe164458b51fd25889f3730d76bd3ebd0a6dfd12f1166b8ac82f13c451be33582b8ee82c29dd96ba09eeecf57b76f46bed
-EBUILD faudio-19.02.ebuild 2399 BLAKE2B 2d8340562b9215a947b77de1af488c63a765ec654e73c5638cf7fab715f28a8067aad98c32bb8e0856d663f6ea9bc04f0af6bf78286b35f9685296bc53411a0c SHA512 b786b10dc4156c815fc1189add4afbbe164458b51fd25889f3730d76bd3ebd0a6dfd12f1166b8ac82f13c451be33582b8ee82c29dd96ba09eeecf57b76f46bed
+DIST FAudio-19.06.tar.gz 899089 BLAKE2B a59ad9613bcfa71e1fc8be1f2d389f56b8f96430c354b7c7148d1e1e084102b6d8559cd258f3ab6969a4ac93e55ea2397b18dc417857e9ee0f022ea0dae65c0e SHA512 ba3ee18b47d8d85dc39e777c420522349f9873cf1528dd6c266f7254fe27cdb5bb6ab5bcbeab870938b509bfd006590d2380908b7d1e3fd679d2a434ce82eca6
 EBUILD faudio-19.03.ebuild 2399 BLAKE2B 2d8340562b9215a947b77de1af488c63a765ec654e73c5638cf7fab715f28a8067aad98c32bb8e0856d663f6ea9bc04f0af6bf78286b35f9685296bc53411a0c SHA512 b786b10dc4156c815fc1189add4afbbe164458b51fd25889f3730d76bd3ebd0a6dfd12f1166b8ac82f13c451be33582b8ee82c29dd96ba09eeecf57b76f46bed
+EBUILD faudio-19.06.ebuild 2399 BLAKE2B 2d8340562b9215a947b77de1af488c63a765ec654e73c5638cf7fab715f28a8067aad98c32bb8e0856d663f6ea9bc04f0af6bf78286b35f9685296bc53411a0c SHA512 b786b10dc4156c815fc1189add4afbbe164458b51fd25889f3730d76bd3ebd0a6dfd12f1166b8ac82f13c451be33582b8ee82c29dd96ba09eeecf57b76f46bed
 EBUILD faudio-9999.ebuild 2399 BLAKE2B 2d8340562b9215a947b77de1af488c63a765ec654e73c5638cf7fab715f28a8067aad98c32bb8e0856d663f6ea9bc04f0af6bf78286b35f9685296bc53411a0c SHA512 b786b10dc4156c815fc1189add4afbbe164458b51fd25889f3730d76bd3ebd0a6dfd12f1166b8ac82f13c451be33582b8ee82c29dd96ba09eeecf57b76f46bed
 MISC metadata.xml 1341 BLAKE2B a5fe79fca0c7f184466254e5f251c6248c20415795933b8797a4bd899535735ed93b54754937ed1003103cbbe3d5d6c5ffc5848c255cfd759cb06fb973065003 SHA512 8ad14c2ae094ff4ffd013458db62263b97cc5e616885cb229ef57ff8a4ab0dd943c2ab3840d086a81a4a10962c0d7411741ac6a8daaefb5167fe988a1dd8122a
diff --git a/app-emulation/faudio/faudio-19.02.ebuild b/app-emulation/faudio/faudio-19.02.ebuild
deleted file mode 100644
index 295da5632494..000000000000
--- a/app-emulation/faudio/faudio-19.02.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# shellcheck disable=SC2034
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake-multilib virtualx
-
-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 ~x86-fbsd"
-	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 ffmpeg xnasong test utils"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
-
-COMMON_DEPEND="
-	>=media-libs/libsdl2-2.0.9[sound,${MULTILIB_USEDEP}]
-	ffmpeg? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-"
-DEPEND="${COMMON_DEPEND}
-"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		"-DCMAKE_INSTALL_BINDIR=bin"
-		"-DCMAKE_INSTALL_INCLUDEDIR=include/${FAUDIO_PN}"
-		"-DCMAKE_INSTALL_LIBDIR=$(get_libdir)"
-		"-DCMAKE_INSTALL_PREFIX=${EPREFIX%/}/usr"
-		"-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)"
-		"-DFFMPEG=$(usex ffmpeg ON OFF)"
-		"-DXNASONG=$(usex xnasong ON OFF)"
-	)
-	if use ffmpeg; then
-		mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${PREFIX%/}/usr/$(get_libdir)"  )
-	fi
-	cmake-utils_src_configure
-}
-
-src_configure() {
-	cmake-multilib_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_make
-	emake -C "${BUILD_DIR}" all
-}
-
-multilib_src_install() {
-	# FIXME: do we want to install the FAudio tools?
-	cmake-utils_src_install
-
-	sed -e "s/%LIB%/$(get_libdir)/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)"
-		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/faudio-19.01.ebuild b/app-emulation/faudio/faudio-19.06.ebuild
index 295da5632494..295da5632494 100644
--- a/app-emulation/faudio/faudio-19.01.ebuild
+++ b/app-emulation/faudio/faudio-19.06.ebuild