migrating changes from 3.7.5 to other ebuilds

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

4 files changed, 25 insertions, 21 deletions

diff --git a/net-wireless/gnuradio/ChangeLog b/net-wireless/gnuradio/ChangeLog
index 522d7fb801d9..0415c11a1a50 100644
--- a/net-wireless/gnuradio/ChangeLog
+++ b/net-wireless/gnuradio/ChangeLog
@@ -1,6 +1,10 @@
 # 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.56 2014/10/09 19:15:07 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.57 2014/10/09 19:17:19 zerochaos Exp $
+
+  09 Oct 2014; Rick Farina <zerochaos@gentoo.org> gnuradio-3.7.4.1.ebuild,
+  gnuradio-9999.ebuild:
+  migrating changes from 3.7.5 to other ebuilds
 
   09 Oct 2014; Rick Farina <zerochaos@gentoo.org> gnuradio-3.7.5.ebuild:
   fixing bug #523906 by adjusting qwt deps correctly
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 21ed7c75233d..831886ae7b91 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -8,25 +8,25 @@ DIST gnuradio-3.6.5.1.tar.gz 3150283 SHA256 0875d2f0a7da0f3bcc1771b528b0f98f79d9
 DIST gnuradio-3.7.4.1.tar.gz 3432417 SHA256 ae35e8b8865ec9dc04bf32c3f7bdd3ce14bef6848c2252d232e13e8fa261f30e SHA512 4435c9419ead019f5bca36ce04ac5a5c48414e79e73c82c0c727d01fb8dc64e4d2b4399f589c299d023b09ddd3df82b75baccda3d057fd9527ce68aecef3d740 WHIRLPOOL 3181e3d49120cbf1fda258d5e927dccbf7b155cb0b524077aa46ec125982f8ce509c465cbed7c81a0d5a9ada921944799efe97f9973d917344d6df95940ae31b
 DIST gnuradio-3.7.5.tar.gz 3529717 SHA256 467f62190687a34f9faa18be8d650e28d7046b94070b1b6d94355c28beb76243 SHA512 f2de907e1404b5b8960d1d0a405a28fa533785115659c50a8ce6ddc7c1e72fc3deae8bb8d9a68614a6df508f3d957d245a533ade00c409403ec88ba173a567de WHIRLPOOL 8ec82403d07af6a754801ad1b48d29d3f2b4a9d19deac485289aef8e78e32b46903cdafab34e0461cb6aac3741a56d1086d60a7de2a7d85bf9e869e13d8fcbb8
 EBUILD gnuradio-3.6.5.1-r2.ebuild 5601 SHA256 93cf9a2d92ecf28f7147343279ce2b8a8a66aa27fed53099f9d9873106a2159d SHA512 fe77be87f2f17ed2d28a311f0c8c16147c790b04e92c36ab9e2b181b94c535afe3d3122a15531277049384dac17c83cd0d9fe47a4e007f899ee608a5f1a5abaa WHIRLPOOL de62e59571dfdd082b545a4ec90541f2db9971f586b95f74c2af48076e96c51c9a249ce4ce9ef30c191be631fe23574559a7e230c98466af9529a7d69ecb0ac5
-EBUILD gnuradio-3.7.4.1.ebuild 7139 SHA256 495471fada6e603f2e81f597fa159122e1b9f98c8b3b79eca002cb8f7a75e2ae SHA512 542dc90f33023390644807bd53df5b1089c8b386a3db68eec8073e2420b9de3013d5134c16a7c5fe9e6a8ab0766bf3eb3fdb46a62933d154d0296de5068f1ea4 WHIRLPOOL 3742fa654cda30d46fc30bbb4c7b4ae95f7d184130ff029be8fa3e7bdf3e029ff775acf1750f25516981935044d7c45647d70c3d5f9b1f791987e84b98eb170a
+EBUILD gnuradio-3.7.4.1.ebuild 7134 SHA256 d37e8f48a6843fd3aee2e7f3cf93b2ea0f8b65028a5e0eaa56c3685c53a50432 SHA512 e463999759b317e75dc801d00bd06762c82b1063d72e887acc3b4758d5dc28d73b5a9e414737ebc7812f4d1af969e8c74c33f56aaf0badf2452b5bc4658a2479 WHIRLPOOL 5ed8a101dc56b11e212aebbec922c7e7bb383138145f2fbfd7c859894fc872b892eb71926923680d7000f1af7558695ad28760c32d52a5bf328d8af571a85fad
 EBUILD gnuradio-3.7.5.ebuild 7132 SHA256 eb35794e23f6533720e3c5bc27c7dcbf47c110ad7bb17dc56cac4dc670423285 SHA512 d861e90669d2c08df43638073ecc693194a017cd3ad569f25b557ed0710cb85ed1ebd67c14e58da360c1c3ae35b6d1842f07615d251fd1defec2a4f51bbec389 WHIRLPOOL 25bc7887d18dc25ad68615b2fb19ec3da902e7bfa650e3b743dbe9fa84a84120cbbf3e7aac48c57acab55a08c1a9564d76bd75b9746f0adebc21ba5dc9a5b020
-EBUILD gnuradio-9999.ebuild 7137 SHA256 8d12a8f210867f59d08979071e522bfcca1a6351d2035380f990fda834035b1f SHA512 aa2ef36fc30af631c79a267aff71d5ccae92346c17652f1ba648e8de8ef611e7ef97127e6f1c3cfc9b769f214c40813179c0178feca8b6a1da9b360ab108f59b WHIRLPOOL 4bcc93b65387f1ceb6896ce51c48b06c1f1dce2433a64dd02e746a7487aa4a7ab2496581d05c4332b675c4d4082e2318668225e256fafde8fbb47bfdaf13e2ff
-MISC ChangeLog 10810 SHA256 4679880e06f42d339dca9e7019cd2ba741902473aefee136cf193f41ad465a5a SHA512 1fe2b2e59f0378e58c6d811644509fca52fdf52b334226c190a38d05aaa4ee66ef53d00ef899c00cb64adfa095eb1380b763debbc727b19bebf0879cc7384bdd WHIRLPOOL 12d71d2efa6c56e12af762e2902f5b34b9b6b990793ac7a529ce3d58c3c1afc781b7c26f1afb17fd2922d5c266c85150d0b6e99a57a7311586d5502216217baa
+EBUILD gnuradio-9999.ebuild 7132 SHA256 e5eae8e4227ad2fbe8f1cb22df9f0cb0256197c4cba7674c0c4f1ed6c6a9ed5d SHA512 7aef5826469e84debc9dddf1367e98173b3fcf0bb99189e43087373da521c8dc49140791a8374a0a9dcdc4770a9c1286b0529b88c1de7f1b138f3d4fcd7e4783 WHIRLPOOL d5d54cfdec51774e7e965df97e6e12130ea9ce7d2ab7cac58a1b19fc9a15e42c192b66829675df2bff7d17ac82275645e34576bfe04ef6e6e15dea4f0ca1eb8c
+MISC ChangeLog 10958 SHA256 fe20e5e60e5fdc00e18ee70df00f586ae2cde47c5b1a43cae5049b6d36073348 SHA512 6825d6827f0b5be31dc1905870cc7c631173610eb423d556fc39917efc61844fae48b63d94e73b90ba8d6dc30a5e7d55fee6fd4983c5ba07139b710aa40681de WHIRLPOOL dfeeca86096108944305d528936254c13a3d803509c738c0cee33a3e5510f5e92a930495826e97f45e43b7c019e1dba4153a8ca8f378bc773650097e00ab37e1
 MISC metadata.xml 1750 SHA256 d8fc5305ded243faf3b60e63f3e36779d6ba44238cf6a3ec6ab605413f3a5b13 SHA512 598b4cd9d9090906f039f1d90e2c5f6cea5b5d0faca0dd3cb5e71adf6597c997d3bc36d21a92d532968be9885af96291e8a5ad6b67f1c41e5a2e89fb015481fc WHIRLPOOL 5b5cea4f525c11540f7c91fcf23c8fa01e50b14f879c0e8480b2a96ccd308e22aea9dda61f72ad5ceb5dc82922e4d6b5acc823a890e5aaa1cfbc5b0c8883a122
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCgAGBQJUNt8sAAoJEKXdFCfdEflKLO8P/0FRjmf75HddA8i+nJPmXn38
-RgRoBEMrsDTMWItimdEHGQqGM76OnX726/ELQNJDhpcemGLc17XSh7OFLvLlBRUh
-5UMccrEqPBjExS3LWEByJYGuePAFBC1kGBgjX8k93dCxfeKKVeLt2XvZFYHdSjML
-Z0CU7n/3Gao0lXco4uNX91dZVfL99kgvy6oRKbKiK3YxarBNAFNrif7qVMl4r9/b
-aUR1+FurVpm5lg8anevGxjCVwsTjEEmfI47r/GoU2CPNQmrRD0xs0dYH+mzzGVbW
-fXlZawvJs2by3l7Nc7wNtbwKMtmucem1NyC5igRXGdTrdGeahedI3sNIARe+AIM/
-1JoGaCqoQXQcNBoOjylRUThmv03JNgHIHVXHAbJwC28izzHf49cueWRDtudM2lqd
-K9MrY8zA9Aw3GyfH2xdR1revQojKSsDwKsJilYSMBwOW5Z6NzZPfhldE2BgHycNt
-TqaPUfGOolOHmIZjOz6DrIo0taC0XYKlnoNzDAOn7Wdd+R0gT+6mKDvQLTXwgSKH
-0iamvVABsFkF1aRRc9d0T9cbRgd1Dprvx6wXdH/kAKdd7QPdP8y392TIO0na2JO+
-dkf4aLsNOqIWKDt2GAI4U51+hXCLygD6qA3ycapvc7NEwpeL8h8+hm33/2JiN6xe
-X5FSXDRQkAWDpjWiDmqA
-=ga7s
+iQIcBAEBCgAGBQJUNt+xAAoJEKXdFCfdEflKma4P/jvtVCBn/NJ3Al4LeL/c5gsl
+fz3Jjeof9Wx0Ahx1Iuucf0MMDlsmTWr18aSRkQbUo5ZadyHhxjzUJ/EtpuiZx+t2
+xjpxGhruU4L0ScZvtFs/iLntXIEPGVP/NMbzdgmD0rIiwfrqPqWWQ/2/VJUFf4Lt
+YtoJtYhszv+25CVTkeraQDtnwXznuOAuhcVUF7/NF92OF5UFdJoZcxkFk3TtGA5d
+446OD6DpHCPAGR27SPNUXhnasDTR2Vtz9QvB2VBoBruA0FZQJDfNQEP+JOrL6YWV
+6ewPIy8eLuB6U/bAthUZt37r0qBeISQXG5HlmL5uWgbeT9aq/SzvTbYiVcew0NN7
+n/UUttYliNPox9S9gLmY2DCEa9MbFOoWNLE6Fcl40Eie5zqAlnAHRJqlXtoXB4RW
+bDLrmbPChceoBSBcpTv8EBo8kDaoepNPAcPGlbBPIoBn8MZ0Pm+DgunCympc4Knu
+k1PNqh4I0RQF47tJnrRcDGc8dyTVkMLO6yT4pHsHxjxGNYhMtyvbG0fzjYsHRSDS
+K5m5Vr3E7SgFsgQQU9tF2BGnZ8UVtxzLzep73/h1e8xmNMZqfTChxX4NeT5A5j2t
+iNvnYKr5Y1fJcx+uinxZqbnQd08izzTwnP9ynMH3x3tyc+moy+61Qa0q5/rzCMhU
+DJS5OvpRYC/HZY/BZ5Ca
+=N5g/
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/gnuradio/gnuradio-3.7.4.1.ebuild b/net-wireless/gnuradio/gnuradio-3.7.4.1.ebuild
index 687445833408..a494b9ef321c 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.4.1.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.4.1.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.1.ebuild,v 1.3 2014/09/11 11:33:48 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.7.4.1.ebuild,v 1.4 2014/10/09 19:17:19 zerochaos Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -74,7 +74,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-5.2
+		x11-libs/qwt:6
 	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
 	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index fd46914a53e2..8c4d0732052f 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.25 2014/09/11 11:33:48 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild,v 1.26 2014/10/09 19:17:19 zerochaos Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -74,7 +74,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-5.2
+		x11-libs/qwt:6
 	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
 	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )