proper full fix for bug #540658, backporting patch accepted by upstream

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)

4 files changed, 37 insertions, 5 deletions

diff --git a/net-wireless/gnuradio/ChangeLog b/net-wireless/gnuradio/ChangeLog
index 88276338a1f1..7163dd941ccd 100644
--- a/net-wireless/gnuradio/ChangeLog
+++ b/net-wireless/gnuradio/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/gnuradio
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.63 2015/02/20 18:35:04 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.64 2015/02/21 04:18:42 zerochaos Exp $
+
+*gnuradio-3.7.6.1-r1 (21 Feb 2015)
+
+  21 Feb 2015; Rick Farina <zerochaos@gentoo.org>
+  +files/gnuradio-3.7.6.1-qwt-with-qt5-support.patch,
+  +gnuradio-3.7.6.1-r1.ebuild, -gnuradio-3.7.6.1.ebuild, gnuradio-9999.ebuild:
+  proper full fix for bug #540658, backporting patch accepted by upstream
 
   20 Feb 2015; Rick Farina <zerochaos@gentoo.org> gnuradio-3.7.6.1.ebuild,
   gnuradio-9999.ebuild:
diff --git a/net-wireless/gnuradio/files/gnuradio-3.7.6.1-qwt-with-qt5-support.patch b/net-wireless/gnuradio/files/gnuradio-3.7.6.1-qwt-with-qt5-support.patch
new file mode 100644
index 000000000000..f155ed51db73
--- /dev/null
+++ b/net-wireless/gnuradio/files/gnuradio-3.7.6.1-qwt-with-qt5-support.patch
@@ -0,0 +1,23 @@
+From b3bdd301debb2eb859473a25b23d068fa66f6cb1 Mon Sep 17 00:00:00 2001
+From: Zero_Chaos <sidhayn@gmail.com>
+Date: Fri, 20 Feb 2015 15:54:00 -0500
+Subject: [PATCH] Update FindQwt.cmake to support qwt6-qt4
+
+allow finding qwt6-qt4 library.  Some distros have added support for both qt4 and qt5 in qwt6, the common name the library uses appears to be qwt6-qt4.  The pre-existance of the qwt-qt4 entry suggests this naming convention is reasonably standard (or at least this isn't a unique hack)
+---
+ cmake/Modules/FindQwt.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake
+index 68f55bf..3ce49aa 100644
+--- a/cmake/Modules/FindQwt.cmake
++++ b/cmake/Modules/FindQwt.cmake
+@@ -22,7 +22,7 @@ find_path(QWT_INCLUDE_DIRS
+ )
+ 
+ find_library (QWT_LIBRARIES
+-  NAMES qwt6 qwt qwt-qt4
++  NAMES qwt6 qwt6-qt4 qwt qwt-qt4
+   HINTS
+   ${CMAKE_INSTALL_PREFIX}/lib
+   ${CMAKE_INSTALL_PREFIX}/lib64
diff --git a/net-wireless/gnuradio/gnuradio-3.7.6.1.ebuild b/net-wireless/gnuradio/gnuradio-3.7.6.1-r1.ebuild
index f02037723c0b..364bbc21d251 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.6.1.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.7.6.1.ebuild,v 1.2 2015/02/20 18:35:04 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.7.6.1-r1.ebuild,v 1.1 2015/02/21 04:18:42 zerochaos Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -72,7 +72,7 @@ RDEPEND="${PYTHON_DEPS}
 		>=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}]
 		>=dev-qt/qtcore-4.4:4
 		>=dev-qt/qtgui-4.4:4
-		<x11-libs/qwt-6.1.2-r1:6
+		x11-libs/qwt:6
 	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
 	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
@@ -113,6 +113,7 @@ src_prepare() {
 	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
 	#epatch "${FILESDIR}"/${PN}-3.6.1-automagic-audio.patch
 	#epatch "${FILESDIR}/${P}-build-type-nonfatal.patch"
+	epatch "${FILESDIR}/${P}-qwt-with-qt5-support.patch"
 }
 
 src_configure() {
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 2e8de326133d..5a493964a41e 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild,v 1.29 2015/02/20 18:35:04 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild,v 1.30 2015/02/21 04:18:42 zerochaos Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -72,7 +72,7 @@ RDEPEND="${PYTHON_DEPS}
 		>=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}]
 		>=dev-qt/qtcore-4.4:4
 		>=dev-qt/qtgui-4.4:4
-		<x11-libs/qwt-6.1.2-r1:6
+		x11-libs/qwt:6
 	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
 	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
@@ -113,6 +113,7 @@ src_prepare() {
 	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
 	#epatch "${FILESDIR}"/${PN}-3.6.1-automagic-audio.patch
 	#epatch "${FILESDIR}/${P}-build-type-nonfatal.patch"
+	epatch "${FILESDIR}"/gnuradio-qwt-with-qt5-support.patch
 }
 
 src_configure() {