gentoo resync : 25.01.2018

6 files changed, 1 insertions, 214 deletions

diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
index bf853fb272e6..cf779ad5a061 100644
--- a/media-libs/libffado/Manifest
+++ b/media-libs/libffado/Manifest
@@ -1,13 +1,8 @@
-AUX libffado-2.3.0-gcc6.patch 1311 BLAKE2B 76148cf44af3130199e8709aae5f7a276a4ed93acfb06735219bc3e4b1bc0d1d37cff57cd20f216e50ec8c1109e33439ecec666a3272809e940b54d61342d027 SHA512 a700c46af0313511bba311fe95634dc0090507256a9ff60a30d10b221fe267d1190af4710b1c4747f8bfa057b0af96e6bab78f6ec4ecef08fb48425092751cd7
-AUX libffado-2.3.0-include-signal.patch 1246 BLAKE2B ac37bf4da0600c0ee518ace257b0de2aaad5a815e3cbedf51490c06ad90acdd893ee2fc40b4b318411c59515654db5276f40e5b0fbe877b5d2985a9e56b0c42e SHA512 c256a59a77160141e082fa6cf358ae0454779e15c01a9ceaf1df8ecd101afc74246654f9c088a67c5453434430bdd390ab2712c617737b2a93fa54edcf685177
-AUX libffado-2.3.0-modelname-strip.patch 2128 BLAKE2B 29c52d8d30136e0a040fe1801a15f4149affbb7de721f8614416a407952714426036f77c2b6451d7bf1f69adbe003258098d2dceda52a7f8d9da0604cdf78a26 SHA512 1ebbe47bdd4d15d6527c4a8c2dfa02861c8a8ce287e1cd44e80356b52007c6e55bc9f267436467f1600c0efbd261da227b947b3648c6a8efcedf8997356153ac
 AUX libffado-2.4.0-additional-py3-fixes.patch 3657 BLAKE2B 8bb214f90fac168c682119d8758efd67812da784770684e7ff47c1d64146da79346d61dfe5b17c0d5e23700f04605d073147a1dd335f0a1da72faf68418a5cd7 SHA512 feb6cd85ee487182b56f003ddee1fc7a1aa3aa07d6d1f3ccbd2ab3735e5d756e836062789a71248d6a16f7377d9d76645c0a17ab76a8d9178b1154cd67783be8
 AUX libffado-2.4.0-crossbar-router-fix.patch 496 BLAKE2B 7a2b88344c319eb5c1da7a4430600843e57eccc6b96d833b7dfc17ca8f63fb22ff50d959ad06c4c8d06036a96412064ce5630f4a26b53fa0b5eb2e392d8ada66 SHA512 5f31f7db57cf54c05dc00bb00f5f0a5e1771dfd2cd716d9bc56788c24313d14d26fb0ffc7865acb5b55504592929a6b271f657e25971eee37c4aa0a7cc03c382
 AUX libffado-2.4.0-py3-pyqt5-fixes.patch 9119 BLAKE2B e1b4ead17535e573bfced949652fec2418b0236b4ab3146f45f6931b0d80f5c1af86f17247e931baf07d9efd3c3726e0d9a0cc42783fd9053464073bdc233577 SHA512 26f34e318040e3fb9066424538d4ad7dd41e49e93c5f89161cd460bce862d3e2a25e0a2ffb6c28beb1f91fdd00a146f7d33930242e52e5148a7d1a0fb0e1ff28
 AUX libffado-2.4.0-pyqt5-dbus-detection.patch 1503 BLAKE2B 448eb997454a72f9d55722462dbe696d293b271002acf205c73e5fb59690ab7ae622830e09ab05def50d73d3fa1bc62076ead695a7d79335b75a00d3a4f1ce73 SHA512 29a44a73786256e8aec380e4e68df9f6de3ceb1d7bf1d4f1565585418ab4167ac2d16b85958cc1acfa60906b384445bd82866d05d3c3f3bdc517ae424d83e559
 AUX libffado-2.4.0-rme-bigendian-fix.patch 1618 BLAKE2B db8969797d9f8bdf4aac9a1e8474ad7d84428ede18788746b885ed037dcc71798a348bc86335dd72083a3937ad00170f6bbe412666f3109395642186b0fb4e2c SHA512 0ecb20c21858df87f53c0033109a4b736e1a38dc8a2b0ed00660cd3b80f74ce7b4cb87438ac5a37e11f0d4650166b3519e163f442d27a7822a24f4485626d776
-DIST libffado-2.3.0.tgz 1239253 BLAKE2B cb470a590df8018975f40f56cde50468a2b51c9504b719b70ce5941406829f25452a96b8ac897aba1ed6c8d4cafa712e7872430e7bb2ebec0822f7b4720084c5 SHA512 24a8853281a17b04623e41dc590f7a9b8f4aebe4dfaece2e3b8fe28457a6ff011586e817712b4913d1fca660b701dddc70576c12d8c56470cf991eb17b4297c4
 DIST libffado-2.4.0.tgz 1228916 BLAKE2B 21a3a2a96377f698e7c1a43912c761624aabe5401f0e147fee4fa203c4534166494de8867320b4b6bc3ff200b65c77bb62ab2c4e98948ed0ee74e6171d162deb SHA512 7df37584925cc908cc284dba344609928d39e006f71ae4ede62e4531b2628271ebd0db00407418e943fb569b5b8b919a76c90aaeed03005cefbd3c1c16ee1627
-EBUILD libffado-2.3.0.ebuild 2684 BLAKE2B 223f4ecd0acedf93aa83a1f0a47fa3f23a731313cca1ea5663b1c4fee515a594df0d04dad429e16c2240e60249b5a0aa151890e57d550462f050bd0ee0c028c6 SHA512 68469a77cf5bba5cc880c35b1d07d0bcb36f41901eebe92e8e127b4cbcd08671d393e29723743d568b5122e878b7f097e512eca6b3a05971fbd0b7b06b9617d4
 EBUILD libffado-2.4.0.ebuild 3194 BLAKE2B 57fc39ce908391aa991a5dc87d90cc9d709320c65c32eec065fb236a8cc3b5cf6b713b3e97bba0d4de1f96bf9dffb7922b8b8b33d6c31fe3608cba9a00a0b82f SHA512 54574ea4a2baa8a18d4dff29972c96cf94401af1e76afb52271358a0d353e51e4aa589bf590534eaf289998c72e3ee36983a55b77cb3b9969fe480a570c290f3
-MISC metadata.xml 625 BLAKE2B ba2bee4e1ba0c8bc9e8a4bda63c8a184fa4992683ec24bec54424049fbc1b66a8332f25eb6c7841df0198a3a973408fbfe82f0ee306d49f1809d82c12ec3b0c0 SHA512 ac725c6eabcc3cd7fa5ac9f20d936e5a1c494d2a2ed6e504bf27cc750cd328600a8dbcd0adeb27d2bd760ce2b577f9860b1041a899fbfde6b67c4b6a681658eb
+MISC metadata.xml 566 BLAKE2B 66bf590980ba18079dfc4127aad3de692e4544f93518fec98e8c337c129df35fac11ff1c8b2c5c3b606855da6020f7abf311b14a4b8b607b08ed1662ae5adc3a SHA512 f1d19db6ac852100cae4d73b8608a892bae5d4907b35601c4c751a35555111de450edf1f0373c2f81cd68e947c76e9c36c7e2b76a8c9d3aa64345fa9b9227b34
diff --git a/media-libs/libffado/files/libffado-2.3.0-gcc6.patch b/media-libs/libffado/files/libffado-2.3.0-gcc6.patch
deleted file mode 100644
index 2a73ee1cf8cc..000000000000
--- a/media-libs/libffado/files/libffado-2.3.0-gcc6.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-------------------------------------------------------------------------
-r2629 | jwoithe | 2016-10-09 13:00:28 +0900 (Sun, 09 Oct 2016) | 1 line
-
-TimestampedBuffer.cpp: move the include of math.h to the top of the file which is where most people would expect it to be.  The patch comes from a Fedora RPM source package via Simon Lewis, who suggested that without it gcc6 had trouble with the file (the nature of the problem is not known by the FFADO project at this time).  Earlier versions of gcc (for example, 4.8.2) had no trouble compiling this file without any math.h include, so the issue that some have seen with gcc6 must be due to math.h being removed from some other system-level include file at some point.
-------------------------------------------------------------------------
-Index: src/libutil/TimestampedBuffer.cpp
-===================================================================
---- a/src/libutil/TimestampedBuffer.cpp	(revision 2628)
-+++ b/src/libutil/TimestampedBuffer.cpp	(revision 2629)
-@@ -32,6 +32,7 @@
- 
- #include <cstdlib>
- #include <cstring>
-+#include <math.h>
- 
- #define DLL_PI        (3.141592653589793238)
- #define DLL_SQRT2     (1.414213562373095049)
-@@ -179,8 +180,6 @@
-     m_wrap_at=w;
-     return true;
- }
--#include <math.h>
--
- /**
-  * \brief return the effective rate
-  *
diff --git a/media-libs/libffado/files/libffado-2.3.0-include-signal.patch b/media-libs/libffado/files/libffado-2.3.0-include-signal.patch
deleted file mode 100644
index 4eabf12eef05..000000000000
--- a/media-libs/libffado/files/libffado-2.3.0-include-signal.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-------------------------------------------------------------------------
-r2706 | jwoithe | 2017-08-08 08:39:56 +0900 (Tue, 08 Aug 2017) | 11 lines
-
-PosixMessageQueue: ensure visibility of SIGEV_THREAD declaration.
-
-Orcan Ogetbil reported on the ffado-devel list that during the recent Fedora
-rebuild effort FFADO 2.3.0 failed to compile because SIGEV_THREAD was
-undeclared.  Jano Svitok made the plausible suggestion that signal.h needs
-to be included explicitly under newer glibc versions.  This trivial patch 
-implements this.  As of this commit it has not been verified that the
-problem is fixed with this addition.  However, there's no harm done by the
-change in general and conceptionally the change is consistent with the
-source file's content given the use of signal-related functionality.
-
-
-Index: src/libutil/PosixMessageQueue.cpp
-===================================================================
---- a/src/libutil/PosixMessageQueue.cpp	(revision 2705)
-+++ b/src/libutil/PosixMessageQueue.cpp	(revision 2706)
-@@ -30,6 +30,7 @@
- #include <errno.h>
- #include <string.h>
- #include <poll.h>
-+#include <signal.h>
- 
- #define MQ_INVALID_ID ((mqd_t) -1)
- // one second
-
-------------------------------------------------------------------------
diff --git a/media-libs/libffado/files/libffado-2.3.0-modelname-strip.patch b/media-libs/libffado/files/libffado-2.3.0-modelname-strip.patch
deleted file mode 100644
index 8f28b6ac0f75..000000000000
--- a/media-libs/libffado/files/libffado-2.3.0-modelname-strip.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-------------------------------------------------------------------------
-r2677 | jwoithe | 2017-03-22 07:43:24 +0900 (Wed, 22 Mar 2017) | 1 line
-
-configrom: there is no obvious reason why a space should be added to the end of the vendor and model strings returned from the interface.  Retain the explicit null termination of these strings to cover for the case where an interface may not return any null bytes.  Also fix indentation associated with the null termination code.  The issue with the trailing space was noticed and reported by Nils Philippsen: its presence broke a test in the saffire_dice mixer python code.
-------------------------------------------------------------------------
-Index: src/libieee1394/configrom.cpp
-===================================================================
---- a/src/libieee1394/configrom.cpp	(revision 2676)
-+++ b/src/libieee1394/configrom.cpp	(revision 2677)
-@@ -176,13 +176,11 @@
-                 ( void* )CSR1212_TEXTUAL_DESCRIPTOR_LEAF_DATA( m_vendorNameKv ),
-                 len );
- 
--    while ((buf + len - 1) == '\0') {
--            len--;
-+        while (*(buf + len - 1) == '\0') {
-+                len--;
-         }
--        // \todo XXX seems a bit strage to do this but the nodemgr.c code does
--        // it. try to figure out why this is needed (or not)
--    buf[len++] = ' ';
--    buf[len] = '\0';
-+        // Ensure vendor string is null terminated
-+        buf[len] = '\0';
- 
- 
-         debugOutput( DEBUG_LEVEL_VERBOSE, "Vendor name: '%s'\n", buf );
-@@ -195,13 +193,11 @@
-         memcpy( buf,
-                 ( void* )CSR1212_TEXTUAL_DESCRIPTOR_LEAF_DATA( m_modelNameKv ),
-                 len );
--    while ((buf + len - 1) == '\0') {
--            len--;
-+        while (*(buf + len - 1) == '\0') {
-+                len--;
-         }
--        // \todo XXX for edirol fa-66 it seems somehow broken. see above
--        // todo as well.
--    buf[len++] = ' ';
--    buf[len] = '\0';
-+        // Ensure model name string is null terminated
-+        buf[len] = '\0';
- 
-         debugOutput( DEBUG_LEVEL_VERBOSE, "Model name: '%s'\n", buf);
-         m_modelName = buf;
diff --git a/media-libs/libffado/libffado-2.3.0.ebuild b/media-libs/libffado/libffado-2.3.0.ebuild
deleted file mode 100644
index b5d17e932632..000000000000
--- a/media-libs/libffado/libffado-2.3.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils 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}"
-	KEYWORDS="~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-else
-	SRC_URI="http://www.ffado.org/files/${P}.tgz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-IUSE="debug qt4 test-programs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="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}]
-	!<media-sound/jack-audio-connection-kit-0.122.0:0
-	!<media-sound/jack-audio-connection-kit-1.9.9:2
-	sys-apps/dbus
-	sys-libs/libraw1394[${MULTILIB_USEDEP}]
-	sys-libs/libavc1394[${MULTILIB_USEDEP}]
-	${PYTHON_DEPS}
-	qt4? (
-		dev-python/PyQt4[dbus,${PYTHON_USEDEP}]
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		x11-misc/xdg-utils
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/libffado-2.3.0-modelname-strip.patch"
-	"${FILESDIR}/libffado-2.3.0-gcc6.patch"
-	"${FILESDIR}/libffado-2.3.0-include-signal.patch"
-)
-
-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)
-		# 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, so we block
-		# lower versions.
-		ENABLE_SETBUFFERSIZE_API_VER=force
-	)
-	if multilib_is_native_abi; then
-		myesconsargs+=(
-			BUILD_MIXER=$(usex qt4 true false)
-			BUILD_TESTS=$(usex test-programs)
-		)
-	else
-		myesconsargs+=(
-			BUILD_MIXER=false
-			BUILD_TESTS=false
-		)
-	fi
-	escons "${myesconsargs[@]}" "${@}"
-}
-
-src_prepare() {
-	default
-	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 qt4; 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/metadata.xml b/media-libs/libffado/metadata.xml
index 52a13df73d66..eda35ae2cc67 100644
--- a/media-libs/libffado/metadata.xml
+++ b/media-libs/libffado/metadata.xml
@@ -14,7 +14,6 @@
 		<name>Gentoo ProAudio Project</name>
 	</maintainer>
 	<use>
-		<flag name="qt4">Install qt4-based mixer frontend</flag>
 		<flag name="test-programs">Install standalone test programs</flag>
 	</use>
 </pkgmetadata>