fix bug in qtgui where we included qwt5 but linked to qwt6, fix missing include for string.h

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

4 files changed, 12 insertions, 5 deletions

diff --git a/net-wireless/gnuradio/ChangeLog b/net-wireless/gnuradio/ChangeLog
index 4ef972379d8b..7f27aef4abee 100644
--- a/net-wireless/gnuradio/ChangeLog
+++ b/net-wireless/gnuradio/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-wireless/gnuradio
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.51 2014/08/24 21:49:25 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.52 2014/08/25 15:47:57 zerochaos Exp $
+
+*gnuradio-3.7.4-r1 (25 Aug 2014)
+
+  25 Aug 2014; Rick Farina <zerochaos@gentoo.org>
+  +files/gnuradio-3.7.4-include_stringh.patch, +gnuradio-3.7.4-r1.ebuild,
+  -files/include_stringh.patch, -gnuradio-3.7.4.ebuild, gnuradio-9999.ebuild:
+  fix bug in qtgui where we included qwt5 but linked to qwt6, fix missing
+  include for string.h
 
   24 Aug 2014; Rick Farina <zerochaos@gentoo.org> +files/include_stringh.patch,
   gnuradio-3.7.4.ebuild, gnuradio-9999.ebuild, metadata.xml:
diff --git a/net-wireless/gnuradio/files/include_stringh.patch b/net-wireless/gnuradio/files/gnuradio-3.7.4-include_stringh.patch
index 1450e101cd05..1450e101cd05 100644
--- a/net-wireless/gnuradio/files/include_stringh.patch
+++ b/net-wireless/gnuradio/files/gnuradio-3.7.4-include_stringh.patch
diff --git a/net-wireless/gnuradio/gnuradio-3.7.4.ebuild b/net-wireless/gnuradio/gnuradio-3.7.4-r1.ebuild
index f5d1691a0439..29fdb22312d4 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.4.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.7.4.ebuild,v 1.7 2014/08/19 02:31:49 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.7.4-r1.ebuild,v 1.1 2014/08/25 15:47:57 zerochaos Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -99,6 +99,7 @@ src_prepare() {
 	# Useless UI element would require qt3support, bug #365019
 	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
 	epatch "${FILESDIR}"/${PN}-3.6.1-automagic-audio.patch
+	epatch "${FILESDIR}"/${P}-include_stringh.patch
 }
 
 src_configure() {
@@ -133,7 +134,6 @@ src_configure() {
 		-DSYSCONFDIR="${EPREFIX}"/etc \
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 	)
-	use qt4 && mycmakeargs+=( -DQWT_INCLUDE_DIRS="${EPREFIX}"/usr/include/qwt5 )
 	cmake-utils_src_configure
 }
 
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index db0f9a9d4b11..a82a3e8c416c 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.21 2014/08/24 21:49:25 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild,v 1.22 2014/08/25 15:47:57 zerochaos Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -153,7 +153,6 @@ src_configure() {
 		-DSYSCONFDIR="${EPREFIX}"/etc \
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 	)
-	use qt4 && mycmakeargs+=( -DQWT_INCLUDE_DIRS="${EPREFIX}"/usr/include/qwt5 )
 	cmake-utils_src_configure
 }