gentoo resync : 06.04.2022

3 files changed, 2 insertions, 117 deletions

diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
index da5c43e2d176..a0494fed9dce 100644
--- a/media-libs/libffado/Manifest
+++ b/media-libs/libffado/Manifest
@@ -1,5 +1,3 @@
-DIST libffado-2.4.4.tgz 1228417 BLAKE2B 70d3b17f7d7317acc63351faaefb27fa850664015134887f0508b4a76aabbf6e9573f87eb2dd9792ac5f4f4b06ac7c872afa33af6af0341e6cceeb43e7a79526 SHA512 065b7f9ce9bf58320c02353b63ed17b3610d0ee8a2de58de27159b2190e39c779094b01ae1123c087387e6077375e646b564b9e7717b192865b2f1f22a3acc80
 DIST libffado-2.4.5.tgz 1229890 BLAKE2B 18c260b782c9a97e3f2c8689a218f7a4925158c3e3cb14987182bf04043438d1325a9ababfe29860f6769a5eeabb49a843a8d15072b24b914334c447b5c7238d SHA512 a2c1d0515e14015b7803c4d52d67605afec27ae2569888dec085375ed4a488f4885b5033369e52305e668a35289d3bd749a9babb5778df339fa93553c23af30f
-EBUILD libffado-2.4.4-r1.ebuild 2749 BLAKE2B 95fdbd0c43c4c9d396d3be9c9b00036b249ec3d1d78d89844203721f00a027416e5d72454c41d6d78a671f7afc84ee3b57eec6609bc00182051c6e6562d8ee08 SHA512 04a62a67a23f1b6b58c9af9a212f705b62a61bbc6ee829d06f562bf852a1b078310b1741698a46b3b2b0df839da74206d8e3554b5d6ce43a42cb08ab34ea88a7
-EBUILD libffado-2.4.5.ebuild 2752 BLAKE2B 05d33916b54e2121789b48d1367b30b9981a2448c56a6c5fe023b1cbe77f602ed2aaa4459b8cfa8131e0855c4e527df7658ff3a047a417adb8d448320ef00dc7 SHA512 12a618e97cef2217fdcb8a396f08e46264c88642f2d96057d5fc404cd5c3425bb9f4d278d9063a7f9606ce3164869ad1b29ec20961443fa63ec0cf639dd6db59
+EBUILD libffado-2.4.5.ebuild 2750 BLAKE2B 11c5d5b664631d266ea57c838012edbcee209fd77457c8230ac01370a3affb94d326c9b1482c720234e4d6cf59108eae85c3c52fa1460784dcd04ef8455192d0 SHA512 3539b52c64ca920567d5db02799ea2476bd9de393e8929e9dabbdbbd617f1e75823acc2182637c60bad43a673fd479078fd0bb59d016f02ab3352c0d5f1ef386
 MISC metadata.xml 597 BLAKE2B 4fc750b04079094c4251e60cc4067847ba015a9bef54c83ac9ecc2b53a24048279df06711b5fa1482e379e25a7cce7aed491a67129469bca46ee747a30f7427d SHA512 9f0823e3554c7602b27d39d565af89079e6a5260f19f6850bf3f2f228a4cd6e40a27f94c1a85e6aed0226918beb6dcefdd85b830fbbe438bdcb899dccd51e4f8
diff --git a/media-libs/libffado/libffado-2.4.4-r1.ebuild b/media-libs/libffado/libffado-2.4.4-r1.ebuild
deleted file mode 100644
index b9daf2d2a40b..000000000000
--- a/media-libs/libffado/libffado-2.4.4-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit desktop python-single-r1 scons-utils toolchain-funcs udev multilib-minimal
-
-DESCRIPTION="Driver for IEEE1394 (Firewire) audio interfaces"
-HOMEPAGE="http://www.ffado.org"
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit subversion
-	ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}"
-else
-	SRC_URI="http://www.ffado.org/files/${P}.tgz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
-fi
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-IUSE="debug qt5 test-programs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-CDEPEND="${PYTHON_DEPS}
-	dev-cpp/libxmlpp:2.6[${MULTILIB_USEDEP}]
-	dev-libs/dbus-c++
-	dev-libs/libconfig:=[cxx,${MULTILIB_USEDEP}]
-	media-libs/alsa-lib
-	media-libs/libiec61883[${MULTILIB_USEDEP}]
-	sys-apps/dbus
-	sys-libs/libavc1394[${MULTILIB_USEDEP}]
-	sys-libs/libraw1394[${MULTILIB_USEDEP}]
-	qt5? (
-		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/PyQt5[dbus,${PYTHON_USEDEP}]
-		')
-		x11-misc/xdg-utils
-	)"
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}"
-
-myescons() {
-	local myesconsargs=(
-		PREFIX="${EPREFIX}/usr"
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-		MANDIR="${EPREFIX}/usr/share/man"
-		UDEVDIR="$(get_udevdir)/rules.d"
-		CUSTOM_ENV=true
-		DETECT_USERSPACE_ENV=false
-		DEBUG=$(usex debug)
-		PYPKGDIR="$(python_get_sitedir)"
-		# ENABLE_OPTIMIZATIONS detects cpu type and sets flags accordingly
-		# -fomit-frame-pointer is added also which can cripple debugging.
-		# we set flags from portage instead
-		ENABLE_OPTIMIZATIONS=false
-		# This only works for JACK1>=0.122.0 or JACK2>=1.9.9.
-		ENABLE_SETBUFFERSIZE_API_VER=force
-	)
-	if multilib_is_native_abi; then
-		myesconsargs+=(
-			BUILD_MIXER=$(usex qt5 true false)
-			BUILD_TESTS=$(usex test-programs)
-		)
-	else
-		myesconsargs+=(
-			BUILD_MIXER=false
-			BUILD_TESTS=false
-		)
-	fi
-	escons "${myesconsargs[@]}" "${@}"
-}
-
-src_prepare() {
-	default
-
-	# Bug #808853
-	cp "${BROOT}"/usr/share/gnuconfig/config.guess admin/ || die "Failed to update config.guess"
-
-	# Always use Qt5
-	sed -i -e 's/try:/if False:/' -e 's/except.*/else:/' support/mixer-qt4/ffado/import_pyqt.py || die
-
-	# Bugs #658052, #659226
-	sed -i -e 's/^CacheDir/#CacheDir/' SConstruct || die
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export CC CXX
-	myescons
-}
-
-multilib_src_install() {
-	myescons DESTDIR="${D}" WILL_DEAL_WITH_XDG_MYSELF="True" install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	python_fix_shebang "${D}"
-	python_optimize "${D}"
-
-	if use qt5; then
-		newicon "support/xdg/hi64-apps-ffado.png" "ffado.png"
-		newmenu "support/xdg/ffado.org-ffadomixer.desktop" "ffado-mixer.desktop"
-	fi
-}
diff --git a/media-libs/libffado/libffado-2.4.5.ebuild b/media-libs/libffado/libffado-2.4.5.ebuild
index 8383212fe83e..3e212bb12d21 100644
--- a/media-libs/libffado/libffado-2.4.5.ebuild
+++ b/media-libs/libffado/libffado-2.4.5.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" = "9999" ]]; then
 	ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}"
 else
 	SRC_URI="http://www.ffado.org/files/${P}.tgz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2 GPL-3"