hack for fatal build type of gentoo, upstream should have a longer term fix soon

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

4 files changed, 35 insertions, 17 deletions

diff --git a/net-wireless/gnuradio/ChangeLog b/net-wireless/gnuradio/ChangeLog
index 200c751c804f..6529787b2cb7 100644
--- a/net-wireless/gnuradio/ChangeLog
+++ b/net-wireless/gnuradio/ChangeLog
@@ -1,6 +1,11 @@
 # 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.44 2014/07/26 05:21:50 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.45 2014/07/26 05:59:21 zerochaos Exp $
+
+  26 Jul 2014; Rick Farina <zerochaos@gentoo.org>
+  +files/gnuradio-9999-build-type-nonfatal.patch, gnuradio-9999.ebuild:
+  hack for fatal build type of gentoo, upstream should have a longer term fix
+  soon
 
   26 Jul 2014; Rick Farina <zerochaos@gentoo.org> gnuradio-3.7.4.ebuild,
   gnuradio-9999.ebuild:
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 6ca30627340c..c5efe1ffde53 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -2,27 +2,28 @@
 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 6064 SHA256 a1c9f61da346753de6195afc6743f549ae5420e30efe1064d2d68bdba29812fd SHA512 be47b278d9aeec8bb34e7a129745f93313009973aabd5473c63a4c05dace290e45a50af1ab2e79c74adf0001c0b521daca497f380bf911e6337f59a98510908e WHIRLPOOL 983502c0abc151cda269908baacf1f889f793ab638bda9217b6c6c20c24683072249eda89a3377d9a95ea19baf1e68e75aaa8371e0c71cbcdbc5a865c1d2ed89
-EBUILD gnuradio-9999.ebuild 6064 SHA256 8d804bf94eb364e6460449e79bb7039e059889bdd4383c64810dd2ead4254561 SHA512 addcb92c2ce097dfd0573c96996d0de9fa9d53ad04557f50c3701e54d36a0ba8219f42b952d5470793521a9a2165e3f6a5f9b892b9792309abb8de4092eb9d5b WHIRLPOOL e9a19efb8863e6608fb6acfbb415e2ba16fbf59fc7145d3048f0c5f64159c4ad685b809c8402a8ac5c5723f8a0482662de13f6bdba23526a9f09763fe747a20b
-MISC ChangeLog 8521 SHA256 f7ecf7c513f66527f4724eb01940a32dac1394d27ab619fcb853048f2e000ced SHA512 b6d7c32546d68c0ccce0c7f337e3e8faf5b0a087067e09f18814f4fffe0c6bfdcbf6d26c150eeafd1b8db20efceb2e3c561394720fd8f3be7deba62725bcdaa9 WHIRLPOOL 7e9cd160ac1960728f24504df4dbf1c49018b1d1a059ce01dbb27c07ffd6a424418b6812cd03f34836dcaddd6e342ebc7ca22baf9192cb7e969d74fa944859a0
+EBUILD gnuradio-9999.ebuild 6117 SHA256 517da3d7b7e8ec9f1f4e4b8b6e54da1e0b7b96911785cc625742f68a5f880181 SHA512 dfcefe34696dbb9c8f7fdcbd55996f240a2d2711d1b5b7c4531c7cbb547dc2cbf99f562c6c96cb1713349e5ffac742273fea36e75548a125624b2490efdd39a4 WHIRLPOOL a3d91b7149d1253bd972af9d31b62bcfd4cd46ab7783f04b30f7a1e94ea40c8be93a3335b58a712b73053eaf86390dbfaceffb62ef790e8545af47423b3b6425
+MISC ChangeLog 8729 SHA256 123da52c071a4f4dbd3d5d43a486c4f4555da44ef3a2860bef67ec9242bef2f4 SHA512 fd050674b2ee68b529bab2045b138242f6b5223f9693a18a3fb300aa17c8ade204143e613704e7c2c52c27c933b6c3f6ab4695170deca09a2d5cf28a960797fa WHIRLPOOL 5f3814a4cc3ed557110b4b13d015f555136b12af2012d3d4cf9741e51b2959b72773f4261867c4ab96172e5f243099590d6149815b97269bbd8b74cba91ad46b
 MISC metadata.xml 1106 SHA256 605ea7e5c4c20b665b7d4143545338d3d69f97fe908c52e9d6ab68c6a5b143b9 SHA512 ad1e3cbc1e0d8992203cc007900b4b9cb007597cb55e836be57766951c823dc77f4d68ecbb041a9a1fda7d2dd3438258e4c8045192d36d1594ed023948cdc589 WHIRLPOOL a5d0abe6a92c13f315bc7c4fba9e5cdcef50f26e58d682fef2325b1293fa2047de5f8aa79e04ba3f5b05c6ba8e1eede4a59e68ce71e2727aa90bfe3c787e9c0a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCgAGBQJT0zvcAAoJEKXdFCfdEflKMY4P/0K1/IxhONaWLZiOdLaLy+/I
-3H6mbqM9oPoqWyMnGR+zYsn0Pi2bEvZJZOsgl5rBkcMOhsYcwwxJkrPwh+c3wwJi
-E/Tqej55uhl3pUrn14WyWh0TKibWa9a/HRUPq1A/bKoM5w3gdM7vCffYYvPG/3q7
-OeIXo9NKlYrTknHQ+epXib1sAh5acK+YRRVw3T0V3SYOgwY1WCRCmR3bcmP1J81o
-SOIy7EeaVNKMd25h2MQyMYiC2nOftDuVbiCdyCe+YqgAcoBaYtIfRld+YoyIgkcb
-roiv2uiiIC+0h1r0X/yxaXnVcFMyx7TuGggCbq01CMatZiI3Q602mWhSQd4Iw1BC
-2SCGseH3+3pVw/UPlSBO8bQmzvRhIikJmwEQV6U5KIznlkvfM4tGJRgB5JB5XmaF
-wjLsuCmAKKXJowpD0q6ZF2A5/m6M7LJhPIgqPeY0iojoV9O7T6rQc9iqeJTAvahw
-MLeDRWz91kPtOIBjwGPyvkm6Efu0yXAIO6GpiPqrtQ6S9mqe3YAcNYH69fwJ3Zwa
-ypbCernimHVkOljpT+WVYs6aVCqDK/SqTkT9c026NPG8yVfHTp/5FReecuIfZDyI
-tl8hHC33XEIs4LL86G+gGwZiWfaUQC8TGtR7WbdbAAhY7rUf37AFFaotNrWosjfS
-co76rXflDMxRYmHKfUN1
-=jPto
+iQIcBAEBCgAGBQJT00SmAAoJEKXdFCfdEflKrBsQALAdKrUkFqFhyTqhdrTNMFsg
+rGjKm2qk919hlgvPI5iFmEzLIIBmTEGrHiCrQqAhY95uj5bI036IDAesP9aAUQso
+yXmrKuDf7ug+rL34CBMqF+PD/q+B2yqRHNVpm17he/tejoKbBCtEH44sTk5TLWbK
+fG97pze7NexrqpdXtwlUWJs5yqlAMWyMZkf1nneWtz8nAc6ugFdI5sR9lEvK2wXW
+zpf9TGFoXxOvUN+OaYwfVIXjSTkFUdRTZwUOKnY1CwmrVHLzJnjPy6UggG/WaTsk
+a/TgGdhfVZHBNDRYMD82N6E4p4YIeeaIjiqFMJhEpDoq54WRUNzu8qZe30bQZizn
+XRFksFOG0PpMi316TNfnjHFy1btdFDFH/FgqQNV7EloicATiPYCu8m7WE+tWBEMG
++4Hst62Edk6zOr1bkIXfEXSTcuvzWZozLq+KjvordrqEZsicGP6dU65yt0XDwdKY
+PYhK2VjtV4dNF5JGGwW2sFa7Oa10YLyy1zlDnDModZaFMY5w1y8aGSgbCHfQVlvZ
+WGT85XqWa6w7LsPYTZYOG4mnPWQLzEE5WV0JphrXQZv/efzRDflcHVbC8SvJVqg4
+cdg0qvfDSSe5bPl+tWg+g16OA1vSvqQcc9unKU7XbCvW6MeOr9b2bvfvQqxgveEi
+v5mIIJVLzrOWmI33xIuu
+=r5ft
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/gnuradio/files/gnuradio-9999-build-type-nonfatal.patch b/net-wireless/gnuradio/files/gnuradio-9999-build-type-nonfatal.patch
new file mode 100644
index 000000000000..f4fcd982b8b0
--- /dev/null
+++ b/net-wireless/gnuradio/files/gnuradio-9999-build-type-nonfatal.patch
@@ -0,0 +1,11 @@
+diff -Naur gnuradio-9999/cmake/Modules/GrBuildTypes.cmake gnuradio-9999-hacked/cmake/Modules/GrBuildTypes.cmake
+--- gnuradio-9999/cmake/Modules/GrBuildTypes.cmake	2014-07-26 01:54:47.645866658 -0400
++++ gnuradio-9999-hacked/cmake/Modules/GrBuildTypes.cmake	2014-07-26 01:56:47.193869859 -0400
+@@ -61,7 +61,6 @@
+     endif(${_settype} STREQUAL ${_btype})
+   endforeach(btype)
+   # Build type not found; error out
+-  message(FATAL_ERROR "Build type '${settype}' not valid, must be one of: ${AVAIL_BUILDTYPES}")
+ endfunction(GR_CHECK_BUILD_TYPE)
+ 
+ ########################################################################
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index f10fb34a05e3..ab27ad6c3273 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.14 2014/07/26 05:21:50 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild,v 1.15 2014/07/26 05:59:21 zerochaos Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -98,6 +98,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}-build-type-nonfatal.patch"
 }
 
 src_configure() {