From f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 30 Sep 2020 17:27:54 +0100 Subject: gentoo resync : 30.09.2020 --- media-libs/libffado/Manifest | 5 +- .../files/libffado-2.4.1-python3-scons-fix.patch | 24 ----- media-libs/libffado/libffado-2.4.1-r1.ebuild | 115 --------------------- media-libs/libffado/libffado-2.4.4.ebuild | 2 +- 4 files changed, 2 insertions(+), 144 deletions(-) delete mode 100644 media-libs/libffado/files/libffado-2.4.1-python3-scons-fix.patch delete mode 100644 media-libs/libffado/libffado-2.4.1-r1.ebuild (limited to 'media-libs/libffado') diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest index a80def47c395..85b69d74699f 100644 --- a/media-libs/libffado/Manifest +++ b/media-libs/libffado/Manifest @@ -1,6 +1,3 @@ -AUX libffado-2.4.1-python3-scons-fix.patch 982 BLAKE2B e9e6e5c8e9582db5e936d355abf8b7292c5a03d799dd3c36d567604a1f959b1b509856ee9ac1e7693a1147907ce7105841010c317d8d2981f35c1c125f4cb5a6 SHA512 5e3de46d1e9ff5d0ee0b555218d1d59deb81e87ccf3f4179c6c25fac0888abf27b96e6cd82a8815b58040b3ab949a5cf2128c709c91ea125c3194e19956817e1 -DIST libffado-2.4.1.tgz 1229295 BLAKE2B 3b42493b68fc8648e116784e04baee2278c21e01fa92b22d990340ef329f67c898e247891e76d494410a758009fcf186ba556e900598eaca539a9879664cc704 SHA512 0859f17b87c68108bbde726d1cf8ab0b99f6f7f02cbe36acd8b451e112688a4d1edc21134eb4a2edc8c92dcf5f5da52efeabb2ad0dc07804ed1aa664a3b38d74 DIST libffado-2.4.4.tgz 1228417 BLAKE2B 70d3b17f7d7317acc63351faaefb27fa850664015134887f0508b4a76aabbf6e9573f87eb2dd9792ac5f4f4b06ac7c872afa33af6af0341e6cceeb43e7a79526 SHA512 065b7f9ce9bf58320c02353b63ed17b3610d0ee8a2de58de27159b2190e39c779094b01ae1123c087387e6077375e646b564b9e7717b192865b2f1f22a3acc80 -EBUILD libffado-2.4.1-r1.ebuild 2834 BLAKE2B 076b3a28bd30ca0e70ee9965fd202b2dd70127c78b170eb7648f863326364a024c38b0341ad60384e6bd505a2f0889dee6b1ac96c8ff2b76557df728eee7e07d SHA512 72552a6e68f95e4063479512458e7b7cbaeb549947333c5f934f3fbe9831cdce98fba296240e7281e6050e7aa1626079a12680503dd31c2d53a8d57c42ef603b -EBUILD libffado-2.4.4.ebuild 2644 BLAKE2B b2a03b729d26cfd5a326ee1c96de3b9dbd17a528d709bce7bc878f2e4e445476d9936965f795b72812c41dc1c531b6713972b9b72f70d977d3d394eab50a7210 SHA512 2eb699ccb36194f5aa84e070df9d8ff443d5cb115ab9f972cea7bee9472cd041f0f188fb720d0c8a43674ce18064a8542c43cc31df6c733e16869e6b2127deb2 +EBUILD libffado-2.4.4.ebuild 2643 BLAKE2B f3203ee701775224cbc0fae2e8a0653c0c81cba08060ed5524cc3501bbdbdb1ab2479f485fb6fbbe68c73cca8ac1c5bd9ca7e7040d03a47a951c0b3f724d847b SHA512 e74563ba928c3f5027e6c66d7eb207f9db9e415f16d1bd3508dd609c68c0263844252d1f45fe153b45d1a1d3a4351ca6e82555401a5a16d2130f2f35ddcfe7fc MISC metadata.xml 566 BLAKE2B 66bf590980ba18079dfc4127aad3de692e4544f93518fec98e8c337c129df35fac11ff1c8b2c5c3b606855da6020f7abf311b14a4b8b607b08ed1662ae5adc3a SHA512 f1d19db6ac852100cae4d73b8608a892bae5d4907b35601c4c751a35555111de450edf1f0373c2f81cd68e947c76e9c36c7e2b76a8c9d3aa64345fa9b9227b34 diff --git a/media-libs/libffado/files/libffado-2.4.1-python3-scons-fix.patch b/media-libs/libffado/files/libffado-2.4.1-python3-scons-fix.patch deleted file mode 100644 index e9cb0fb94f46..000000000000 --- a/media-libs/libffado/files/libffado-2.4.1-python3-scons-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- libffado-2.4.1-old/support/mixer-qt4/SConscript 2015-04-12 20:18:15.000000000 +0900 -+++ libffado-2.4.1/support/mixer-qt4/SConscript 2018-06-26 19:59:19.015719710 +0900 -@@ -29,16 +29,12 @@ - if env['BUILD_MIXER'] == 'true': - e = env.Clone() - -- def findfiles( arg, dirname, names ): -- for name in names: -- if name.startswith("."): -- names.remove(name) -- for name in names: -- if '.pyc' not in name and '.in' not in name: -- arg.append( os.path.join( dirname, name ) ) -- - pythonfiles = [ 'ffado/config.py' ] -- os.path.walk( "ffado", findfiles, pythonfiles ) -+ for root, dirs, files in os.walk( "ffado" ): -+ for name in files: -+ if name.endswith( '.pyc' ) or '.in' in name or name.startswith("."): -+ continue -+ pythonfiles.append( os.path.join( root, name ) ) - - e.ScanReplace( "ffado/config.py.in" ) - e.Depends( "ffado/config.py", "#/SConstruct" ) diff --git a/media-libs/libffado/libffado-2.4.1-r1.ebuild b/media-libs/libffado/libffado-2.4.1-r1.ebuild deleted file mode 100644 index 4d945041ea53..000000000000 --- a/media-libs/libffado/libffado-2.4.1-r1.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python3_6 ) - -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 x86" -fi - -LICENSE="GPL-2 GPL-3" -SLOT="0" -IUSE="debug qt5 test-programs" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPEND="${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_MULTI_USEDEP}] - dev-python/PyQt5[dbus,${PYTHON_MULTI_USEDEP}] - ') - x11-misc/xdg-utils - )" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND} - !=0.122.0 or JACK2>=1.9.9, so we block - # lower versions. - 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 - - # 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.4.ebuild b/media-libs/libffado/libffado-2.4.4.ebuild index bb43175befea..71156c2cf4da 100644 --- a/media-libs/libffado/libffado-2.4.4.ebuild +++ b/media-libs/libffado/libffado-2.4.4.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 x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" fi LICENSE="GPL-2 GPL-3" -- cgit v1.2.3