per upstream and bug 519586, fix dep on cheetah

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

5 files changed, 30 insertions, 28 deletions

diff --git a/net-wireless/gnuradio/ChangeLog b/net-wireless/gnuradio/ChangeLog
index 6266a4543e52..a37582b99a4d 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.48 2014/08/01 23:44:28 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.49 2014/08/15 00:52:36 zerochaos Exp $
+
+  15 Aug 2014; Rick Farina <zerochaos@gentoo.org> gnuradio-3.6.5.1-r2.ebuild,
+  gnuradio-3.7.4.ebuild, gnuradio-9999.ebuild:
+  per upstream and bug 519586, fix dep on cheetah
 
   01 Aug 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   gnuradio-3.7.4.ebuild, gnuradio-9999.ebuild:
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 14d6b5eeb046..a314374d0319 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,31 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX gnuradio-3.6.1-automagic-audio.patch 2839 SHA256 3e65981e8e8e9c2fc5e8223bf7e93956d6f802bbd9df15277283e9d44b7c5a2b SHA512 406ecc20f4818f83cbd599c216c60a6d0daf70ed3d227613421d53466307e44f3d32cf5480401273baf74a488c3f73349c145452ca865f1ca9365314c1813768 WHIRLPOOL 363650437161e68f056229315f1d0b52fa409ba9b284196c16e7acf96b68e2e036930db45188f61b5b0bb0e4f51bd3007d8fee622476eb605c72f2ff4b6c24c7
 AUX gnuradio-9999-build-type-nonfatal.patch 619 SHA256 35fb7fe91213537f89224249d4dcafaf3d250d64747f32ac51c7ee80eadc9dfa SHA512 dde528d32c214c1725e737de2247d2744367d1f47dd416543dc4a74f2ea63f127a14d0ff8ba8d8de2a0a119c35ff7d86b590c14f0f69fd6e23b3f417e3ccd675 WHIRLPOOL e2edeb12cdfd9b9b51ce90cbfea6d075563167301d2ff364eb517bf9b2f9f02e2067e929629fba9d7f783f3aa4286b547e75dcf47bb56725284bf33d661dcaba
 DIST gnuradio-3.6.5.1.tar.gz 3150283 SHA256 0875d2f0a7da0f3bcc1771b528b0f98f79d9ab69aa1ef953651bbbe1f57b4621 SHA512 23a22aed482da11005b17e5197ee3ba24d442b30309522b0858e694b58f46b76cc050143d365623c7dd4241cdf8b9f988e1a4dabe2e1f98d0fd4cca71bbb82e8 WHIRLPOOL 7cf55be5fac7891a737d228d83718bbc43f9069c6275c5ac465ae11088559dca5e7fa31239e281271b529aa8b9ae1a0efe3850a16a40e53c0f1fe57e351ff2a8
 DIST gnuradio-3.7.4.tar.gz 3461336 SHA256 681da0e8694cc88be2dc168756418f21fef3666231d7b21bcfd6cbddd9a9406d SHA512 8a7d6abb4c0065bcd735ef0962619220708078b84fdf07955f6fdfed830a6d35ade15d2620ee915416e439b9eeed4371f847bf33690820f780c77eaf0cf80ad7 WHIRLPOOL 8d4ef9b475f431b38da1b67c94fcd22e04de0967eb89ca1eb88cf99eccf38cfac588621b7211a8acae73927d1c2231760df94a498139a272b7b5f6e19230c7f6
-EBUILD gnuradio-3.6.5.1-r2.ebuild 5583 SHA256 5540842f65142861c5144fd494d8e8d47d7ef72746cb753f747afcd31387487f SHA512 91e151bf28e1d21e2d9da822cae7c02d4985498c5c7a4548b913fafed9898e7266e0268ecd7b0ae9f3a5ed15fdff5cc912b67f7475af72f59ad2761b512f0b68 WHIRLPOOL 605e0ea1da8bd38616c6751540ace9c174aedd6d87352dbea7acd26215efa20c6671367d96c5d61f154b7de8cf60079e690a11ca63f99c9dce4a2989f691243f
-EBUILD gnuradio-3.7.4.ebuild 6088 SHA256 58197c246293afd006a6be7134a9c25b5747f7888a820b7f9916f32e730a80e7 SHA512 c2f73734174d65839c73a7d75f006f61de78a5bafd24ab8300d6040e6c5e98fcdafdf1436b93c0da5dc12fb72abbfe021cb35f49ede46a8bb57b975cf8627833 WHIRLPOOL 78531166ec709de571e5af588a636a423517a81df6fd1fc71430ce16f97d1e63e85e445441e1b4a98d787743540767f341243e5aeba713c6ed19f2ea22414951
-EBUILD gnuradio-9999.ebuild 6229 SHA256 cd4fad91de89d2363f3113350e359f0f7dc53f50cbf12ece7b93e37e99a45233 SHA512 e420c120e855be07f8d4b7fea9f633a871835133a733e63c6245f9d10efcea9f36e4763f1b1c0f630bbc2325fb784ce41033aaedece129e6a27b041d9d8ac628 WHIRLPOOL 463713eecbea4a8f82faf242d292c0cf395bc0abcdd59f9c469e42cdd529433839dfbaa1879caa077088888cac89351cdf245373a4def75b08e39d37b7f8a371
-MISC ChangeLog 9189 SHA256 852509c5261aeb185ebe83a22cc89c9fbb0cec4a608e6a68e31976fd1bb169a4 SHA512 6818a2cc5ef06f1f375f68edcb1c2da808e109f1b85f8fb78a5fe2d09d641fed640c036fad69b3285bd999822c5bd58c3c01993fedf6952eea1e0c163653b005 WHIRLPOOL 270801d9b948f2d57c673af7000badbc4479cba49b32c01fb3c69aa5dcfd9b96eccfb4ca43e94098b96cfd1d3292c7b7942a3c089d9ac584c142abcd43bb2853
+EBUILD gnuradio-3.6.5.1-r2.ebuild 5601 SHA256 93cf9a2d92ecf28f7147343279ce2b8a8a66aa27fed53099f9d9873106a2159d SHA512 fe77be87f2f17ed2d28a311f0c8c16147c790b04e92c36ab9e2b181b94c535afe3d3122a15531277049384dac17c83cd0d9fe47a4e007f899ee608a5f1a5abaa WHIRLPOOL de62e59571dfdd082b545a4ec90541f2db9971f586b95f74c2af48076e96c51c9a249ce4ce9ef30c191be631fe23574559a7e230c98466af9529a7d69ecb0ac5
+EBUILD gnuradio-3.7.4.ebuild 6106 SHA256 685e522412703aa9302a5d416b1b5476d5860221f7fa78dcb63c1f5ee7ea1398 SHA512 ac340f6f5350448fedf93bb98b89809bc6d4fed657a0b23464a16a644cade1c19ae9c287dfc38227f343f7cd8d35555e5382add7bad0d9d7e249c3a3e0c972a5 WHIRLPOOL 35874ccc8a04559aacf13b24719f71bf5282f53783ae10b3b8efec616d715d2532e4ba5ab843a423a0582e94b245b8e391c1fbab347f7f206af98f0ddb8c2234
+EBUILD gnuradio-9999.ebuild 6247 SHA256 aaf20c85f3b642138cc75112cb9b68a8c74308b0df93a62bd298c03227d185dd SHA512 16e9b31d85d25e8a91ac9e031092e838500fa7598a917539fafa24efd5845773b7f9603f9284cf8ea24b66b7bad8de58c9def23156c049747aa7e25882add7c6 WHIRLPOOL 1f852654cb4c3457c3a3dbd05e5faf2cdb6ed21eaa0b301f90d225e2131919d8a55057b1216fbbda6c2067598dd315b4b63fcc59afad0d158328da297da49746
+MISC ChangeLog 9366 SHA256 76dc065f4591882c073d602ec520602a759cd1f6e89ac2104208f7e9bffeba0f SHA512 8fd3a0788db9878a775f7a1135b9c8e161de7aa5ce32ea3528f486ed37cbeb748028217ccd3b591088ae4e2f03185e618c60224720e1fb955ddbe7a46d02c03c WHIRLPOOL 2a0ce9df6df48c653106c1e6e9d91a85a9573356cd3bd457b3b6ee8ce257a5c2728caa3ee103f6ed052e00c0939ac4313fd41aa73fff489e7e77f58e8804f546
 MISC metadata.xml 1172 SHA256 7d656856552271b7db437a1dc2a59ffc206d51e1fb59c858e456e81da0f063f2 SHA512 510a7d6c09d17ea9cba98b86acbd5754e5532fe80051e61afa37cde5ff8a984dbe0da7732ec265581e342e56362a8795d339b09cb9fbe39918a842d615c3dad9 WHIRLPOOL b584cf3a309f5c0130ae362966c150ded03bd24c5586f597ae0894f2837d6489b4d358cf9fb43000abbeb46e77d485ec4cfc8693b5bccd15f826a473b37ed9c0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJT3CaAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RDFCODdDQUUxMkUwNkJCNjUyMDMxOEIy
-MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYRc7wP/1yUtNqMi2vj1qsoMqBHHDS/
-JaCqWKeIIBhlx1lK4DdOj7iQai43g538EGWGQTkkq62Z3LZtzBZcUX2/WIF3DABC
-Kus7Gf0ZYexOdLetUZWMNErXbgszjGykq+CUd4OsApdgJTEiEpdIkVfmWcshXnmO
-VpdxgRHydrhdleZmIEPGqA8Low8Rb4JNI+G37ji7I7JKvq690h6BspmedcFsCd/v
-scH8/YELaQXs5xspqrvfN6T0VEej/9XEUfITH9gfMju7yAwvZIzNWIyAcDIbydZX
-KRX1p9XS1SXEqMEnzzaL6dz0l/bEb2B8/dwXnFK2+cgKIZV697b/lsnWFsgDxjj5
-8+X81aLLemFO583u55G86W3S/T2tDr6JRoSfNf+35yMd8YjQg2zm76pRIGeDghGH
-OQ9+tH9ErIMYuzRFe17xrzoBPHEU+jNZHY2+y0cGjJ94A5egeT/CqUvBhyCZJxWx
-ZKsNtk96ADVv2gNf+U2UFNmvO4g7hQat/tsid+5je/Aj1h1uH3QiD7lmWG6Veis4
-X+xjlPZTbFdheMpIXaUkREQjhopfUIuZxHtedJV1kyBQz72uyDhBL8qKWjx3+p7c
-WNmcPM27fwk3ZO7Y3Rlcog0b/abb40TcMem4tKy5x/mLG0jWiqYPyK1j++rF7UfT
-3qi2H5YjApVWadEND2sW
-=VLeV
+iQIcBAEBCgAGBQJT7VrfAAoJEKXdFCfdEflKJDoP/Rq3saP6oqNYFxTQSmY2tmp+
+vrZrr1oazT+AtTujhzONljcIJWmfro+As5zDOALY5PiCmEIeZYIS6NGr/iveqAmB
+6DypOMp24lba9Ee9MIwkVkzfBJ9mth5v3ekbpjJ0D8TyTu16n1lVo6wRjMV9QkYF
+gC4sKvU7oF6NDlXL+d63AhKUyvfAEqYjxtCDxTwu028LTqw/PRGTCphtbli4bXpq
+G5ZNbZgoy9FqcFbILTfKKWAo4P9K5mCqjRnBkUMjpMqEvcarln5uuT0NwR5N9dMm
+EFOmEEEZwc8F0RvwLx4yaDjxST2i4axCAqCl50M9L+9jG8dSH6guzsLx8tpcyi5X
+g8kvUoW6/epHqCe2Vw0yJW+Kj03iuPWa35ZzjjfER5fyvv49jMYMUxwctSPDYGDP
+eD/ZtedSbK8Rs+gwFzv59RCJzQVuMDmdaLsxOPKJZA29+Nu4N26AtCN9dpjTiuJH
+O/+Ltuq61leqjFtuJd3aF3TVCC2UW9yMI0LlGS/0WM75AETC5PmPf3Pgn7d2szJb
+RWxb/2pqg389Ji5D6QVyplPJQ4170ZBcrQzGuu8VL67nvgsSHLqiyLk6lSnU+FRe
+dQFoWPuFnjyh/IuNTFUzqpZXl0fp71o5HidtOZ1Wy1cNCf50wUfIOun7fkYZy398
+pqjfwucaUwyiJWr1rHi0
+=vMcs
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
index 3b307ec4f79c..3f7cd2ed39eb 100644
--- a/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.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.6.5.1-r2.ebuild,v 1.1 2014/03/05 16:18:40 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild,v 1.2 2014/08/15 00:52:36 zerochaos Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -40,7 +40,6 @@ RDEPEND="${PYTHON_DEPS}
 	>=dev-lang/orc-0.4.12
 	dev-libs/boost:0=[${PYTHON_USEDEP}]
 	!<=dev-libs/boost-1.52.0-r6:0/1.52
-	dev-python/cheetah
 	dev-util/cppunit
 	sci-libs/fftw:3.0=
 	fcd? ( virtual/libusb:1 )
@@ -75,6 +74,7 @@ RDEPEND="${PYTHON_DEPS}
 "
 DEPEND="${RDEPEND}
 	dev-lang/swig
+	dev-python/cheetah[${PYTHON_USEDEP}]
 	virtual/pkgconfig
 	doc? (
 		>=app-doc/doxygen-1.5.7.1
diff --git a/net-wireless/gnuradio/gnuradio-3.7.4.ebuild b/net-wireless/gnuradio/gnuradio-3.7.4.ebuild
index a4230bf117e2..b906d23d185f 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.4.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.4.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.5 2014/08/01 23:44:28 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.7.4.ebuild,v 1.6 2014/08/15 00:52:36 zerochaos Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -50,7 +50,6 @@ RDEPEND="${PYTHON_DEPS}
 	fcd? ( virtual/libusb:1 )
 	filter? ( sci-libs/scipy )
 	grc? (
-		dev-python/cheetah
 		dev-python/lxml[${PYTHON_USEDEP}]
 		>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
 	)
@@ -81,6 +80,7 @@ RDEPEND="${PYTHON_DEPS}
 "
 DEPEND="${RDEPEND}
 	dev-lang/swig
+	dev-python/cheetah[${PYTHON_USEDEP}]
 	virtual/pkgconfig
 	doc? (
 		>=app-doc/doxygen-1.5.7.1
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 04a9733f3a13..a09555a8b596 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.18 2014/08/01 23:44:28 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild,v 1.19 2014/08/15 00:52:36 zerochaos Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -51,7 +51,6 @@ RDEPEND="${PYTHON_DEPS}
 	fcd? ( virtual/libusb:1 )
 	filter? ( sci-libs/scipy )
 	grc? (
-		dev-python/cheetah
 		dev-python/lxml[${PYTHON_USEDEP}]
 		>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
 	)
@@ -84,6 +83,7 @@ RDEPEND="${PYTHON_DEPS}
 "
 DEPEND="${RDEPEND}
 	dev-lang/swig
+	dev-python/cheetah[${PYTHON_USEDEP}]
 	virtual/pkgconfig
 	doc? (
 		>=app-doc/doxygen-1.5.7.1