drop build type hack in favor of build type none, add zeromq support

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

4 files changed, 28 insertions, 20 deletions

diff --git a/net-wireless/gnuradio/ChangeLog b/net-wireless/gnuradio/ChangeLog
index 6529787b2cb7..f8e7ffe461a2 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.45 2014/07/26 05:59:21 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.46 2014/07/26 21:48:24 zerochaos Exp $
+
+  26 Jul 2014; Rick Farina <zerochaos@gentoo.org> gnuradio-9999.ebuild,
+  metadata.xml:
+  drop build type hack in favor of build type none, add zeromq support
 
   26 Jul 2014; Rick Farina <zerochaos@gentoo.org>
   +files/gnuradio-9999-build-type-nonfatal.patch, gnuradio-9999.ebuild:
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index c5efe1ffde53..828221a4ec90 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -7,23 +7,23 @@ DIST gnuradio-3.6.5.1.tar.gz 3150283 SHA256 0875d2f0a7da0f3bcc1771b528b0f98f79d9
 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 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
+EBUILD gnuradio-9999.ebuild 6205 SHA256 dafc6c4c365106ac5f4d3173f5bdfa7c9dd34ead340eaf210f1c780ee3f621dc SHA512 126d61cdc9685b5f708d41edd1ce94ae487e825c2cc89f6fd1a89fc30d8308f2ac6de34a9229decb8224c3e533f83f08e20b7bd00a1a8e9d65d67743c9034fd7 WHIRLPOOL 7aa6eea8092b933f7a9a07f6e3a11d5c398927c877607e1a1aae11e8878406f1a9d8fa3e37d49166c73996f05a92c9fb5d43de08a3c494604764417009f03cf1
+MISC ChangeLog 8889 SHA256 c9bfd8dacf776a91fd5c0986f0837f264e4530a017e465b3d54075ef93385cea SHA512 d9b9a729d71ed2fa6fee4fda30ce606883fc5aac2648bc7692943f08df140126930a776d1de35a76de6a549f5e37c669e8186a8fe827263e839f25c00ac158ee WHIRLPOOL f5cf819dfe86872572e52b597b45262556127312811e6e24cc4c391f42086618d4ca04dac9224da2a4ed09c82afc196abdbb4b3e26cbeac79aad461cb682c896
+MISC metadata.xml 1172 SHA256 7d656856552271b7db437a1dc2a59ffc206d51e1fb59c858e456e81da0f063f2 SHA512 510a7d6c09d17ea9cba98b86acbd5754e5532fe80051e61afa37cde5ff8a984dbe0da7732ec265581e342e56362a8795d339b09cb9fbe39918a842d615c3dad9 WHIRLPOOL b584cf3a309f5c0130ae362966c150ded03bd24c5586f597ae0894f2837d6489b4d358cf9fb43000abbeb46e77d485ec4cfc8693b5bccd15f826a473b37ed9c0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-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
+iQIcBAEBCgAGBQJT1CMYAAoJEKXdFCfdEflKHGEP/1caAbrWawq9ioAEDs7/uu4o
+1s6eBUtUxH59QyWVFQAcSjwFLez/jXYRsNjrqS9gXB150brZMq1TD+s034Y+anZq
+xGVDBAjje4srrPENN+1iT68Zv9mr27a45tBY6IPhVzaK0zWOa/cdBppeyozNfp9j
+OlzhiDjYmnGoMG8ze+u5lTWbVYz5f8Q+7PdnyCaW4y8ZFTtvLWl9jzn32x4ULilZ
+awXgPeyZMF+jN8ht48JiDPZbELNUMPESP7OIIr+HUlHIsEjx1vfr8m3RK8jT2YfV
+WEQ9MBC9FC9Y/y/hOV9m9/UchbV9veKFRJMJvYP3O9toT+2rDxzCzZUucfW/fsSn
+8s/dlXcOj/hG7tgZubVMfEm62E0uodCO0bQYhLh833VylgDqEVjTgvS+rBZoDa+M
+Pt6BSse7Kj9ChM7yfMpLeJCxIQwAPus4pP/KiNV8XoOH94L2XZtXZrBvxzsXIDHP
+1/iroI7rDtYcKA93WOzWMMRd9qgAH33TXQJ+XGMDmn4Dm7UpZWRGH7maZ9vcqU6x
+DLY2NQvLS4fhx1jZarqsAcFj3apteVV1lWT/iUenfb1kWP82TRswcIhhJl1y/NiY
+fzKvtwSlMLPpPg0aIo9mVd2CsMoVb6D6SOn+KXtyCWqOt+L/Bt9z0q162Ywd8+py
+uEXDlYSm9c31eZFaFdWP
+=4zPt
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index ab27ad6c3273..e00ccbd832c3 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -1,10 +1,11 @@
 # 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.15 2014/07/26 05:59:21 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild,v 1.16 2014/07/26 21:48:24 zerochaos Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
+CMAKE_BUILD_TYPE="None"
 inherit cmake-utils fdo-mime python-single-r1
 
 DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
@@ -21,7 +22,7 @@ else
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
-IUSE="alsa +analog +digital channels +ctrlport doc examples fcd +filter grc jack log oss pager performance-counters portaudio +qt4 sdl uhd +utils wavelet wxwidgets"
+IUSE="alsa +analog +digital channels +ctrlport doc examples fcd +filter grc jack log oss pager performance-counters portaudio +qt4 sdl uhd +utils wavelet wxwidgets zeromq"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 		analog? ( filter )
@@ -78,6 +79,8 @@ RDEPEND="${PYTHON_DEPS}
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/wxpython:2.8[${PYTHON_USEDEP}]
 	)
+	zeromq? ( >=net-libs/zeromq-2.1.11
+		net-libs/cppzmq )
 "
 DEPEND="${RDEPEND}
 	dev-lang/swig
@@ -98,7 +101,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"
+	#epatch "${FILESDIR}/${P}-build-type-nonfatal.patch"
 }
 
 src_configure() {
diff --git a/net-wireless/gnuradio/metadata.xml b/net-wireless/gnuradio/metadata.xml
index dba7d5dedc54..d636725abf00 100644
--- a/net-wireless/gnuradio/metadata.xml
+++ b/net-wireless/gnuradio/metadata.xml
@@ -16,6 +16,7 @@
 		<flag name='uhd'>install UHD source and sink blocks</flag>
 		<flag name='utils'>install scripts to enable viewing and analysis of files produced by flow graphs</flag>
 		<flag name='wavelet'>enable wavelet signal processing blocks</flag>
+		<flag name='zeromq'>enable zeromq message passing blocks</flag>
 	</use>
 </pkgmetadata>