bumping stable, fixing automagic deps. This is a good ebuild to base other gr ebuilds on.

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

5 files changed, 125 insertions, 26 deletions

diff --git a/net-wireless/gr-osmosdr/ChangeLog b/net-wireless/gr-osmosdr/ChangeLog
index b8814065f0d9..698ec5feaee2 100644
--- a/net-wireless/gr-osmosdr/ChangeLog
+++ b/net-wireless/gr-osmosdr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/gr-osmosdr
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gr-osmosdr/ChangeLog,v 1.10 2013/06/05 02:53:49 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gr-osmosdr/ChangeLog,v 1.11 2013/06/17 19:49:46 zerochaos Exp $
+
+*gr-osmosdr-0.0.2 (17 Jun 2013)
+
+  17 Jun 2013; Rick Farina <zerochaos@gentoo.org> +gr-osmosdr-0.0.2.ebuild,
+  gr-osmosdr-9999.ebuild, metadata.xml:
+  bumping stable, fixing automagic deps.  This is a good ebuild to base other gr
+  ebuilds on.
 
   05 Jun 2013; Rick Farina <zerochaos@gentoo.org> gr-osmosdr-0.0.1.ebuild:
   adding ~arm keyword
diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index 01d0dc36001c..cdeb85a676e1 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -2,24 +2,26 @@
 Hash: SHA512
 
 DIST gr-osmosdr-0.0.1.tar.xz 119808 SHA256 d682436f34e09b72a41eba2b2f478171329fbc28c92cfa183e77effe05699fd3 SHA512 c1640e05d22ebe72bba18f5eaea464402d965a3a61ef6784477e6867577041cd629329f862afd9545c95ed2a2966eefcbbf8834d1121f1b494e6b5a3e268f4fc WHIRLPOOL 6db8dd7e196721853a312f9e45b17ade0cf2a16821cb6c9c5c9f866aea4abc727c90a165139fe3c66b351f227ac47c4ee3c72d75430777ffe84c3b9135fc3e6b
+DIST gr-osmosdr-0.0.2.tar.xz 120768 SHA256 f9e16210761de6e844b6618877f5ccb74f007d319a4b4ade1f5750ca9f279586 SHA512 2a425cbf41611084a1620c5aaec540432652280a6704a1c9d7fdb942721cd53fd10c5c0a8f099b76d4757f2bc92b38308bba3f10311876b99116634bffeb4df9 WHIRLPOOL c7da0d265029adada5c6ff251deb46cb7f212b5b29b94974bbb8c04a533f36bc92f2074e908500f3ce46b56572228c209d87eaae08873f6a7f2a1d046effe43c
 EBUILD gr-osmosdr-0.0.1.ebuild 873 SHA256 b94600adaec226c853e04f26c6ac9428e89147c13562ea859c2e984126b62e8d SHA512 9f33d0eeb62ecbfdbb38fb04f45b19b8ff28a4812764dd49f567d4a66beb24c47ef354fdf8d5926e19981161b83bc8754a6f2335d44dacad27583ef94bf486a3 WHIRLPOOL 32e0fcccc92765de7c55e83210b75bede9653831b93b55d479d384cf773234fda1d92ed68069be22fa1e7e38997cd20b4979a42d9aef9b76a9f443df93744e73
-EBUILD gr-osmosdr-9999.ebuild 884 SHA256 baf382b44642a5fa1d5fb6ac1bee802e6a39882d2535a9309197024aa56d9450 SHA512 b126c6185039fa0788873447afe085ee57c249e53b9a7cf1f5016fab4e1d78f097efcaf19f181711f29bb14280100708e0019d42c78d0a0ebb83d90a78dfabeb WHIRLPOOL 93b9286c9e8c988c27af1a600f6ec04c4a813cb54c089b5add7246725ac112852b86b7813f38ca0940641855a2a35fb2ef3bfad30130da769d941f343c9697b4
-MISC ChangeLog 1631 SHA256 6aeb250ca830df7f32c45773a949317fa84a5bfbe9b4979ec83af8955c85f3d2 SHA512 7349562d62509118d9eb1999e47646c168bc7b890728e201c2adf5012a632262efa5921896d887f814c6945c8a8fcee13a0cc3b35c4667b18a1dab33456a44ab WHIRLPOOL cc09e064a5fc086e6f44d81b1ea6aa65b0f85b6e6ab2a851efb60effa5a878f8d759358bf02591fd0cd73a594bb0345b602f1841187387c0227e9d4333e10800
-MISC metadata.xml 160 SHA256 85c481a245f23f79fbef161bee8d9b8437f1b1e672a8fdb2dbd20f10c7c69f7b SHA512 6c07e111ed731e33aa9072a2b9297020ded8a259da43d2910a576363055c772d3f8a735e435c6f3136b7e57d489b2ca164e24b490393add3a7c5b3a11e7da507 WHIRLPOOL c3d4674d072eb96840d34218341e427cec657d31392d484fedfa61b6da802ab1e1b7ffb4d8dbc1eb75980e203ce8415609fb733789674250ae7ed91eda2b674f
+EBUILD gr-osmosdr-0.0.2.ebuild 1555 SHA256 fca86d552365835cbaf64501719d6e24bf4af4c46516b0f10d6ea45b30b3311c SHA512 8bf922b6699d1d10b19973de22375988960ab141c447eb5b9c44eb03d9f25b34d8232add08df932195c9bb42662ea86f2c38ac9dbfba3857e375dacb22ab221d WHIRLPOOL b9565910b57d451e8249ccbdbf0158148a66d4031d7c149f701329b040f519c6b31d4a2866df63727c95f85f76fec858df29d3ffa23928af80ce91f37d42a150
+EBUILD gr-osmosdr-9999.ebuild 1606 SHA256 2406bd7dc2b5ecf97a92e746c2b0cded171f7f72f1315f778cda919808c592a6 SHA512 5e9d84ebac6fa4d40c810e0a9ce28870accc5d2759bcad2f46dd83fedc10bc4a0cf7645d8c3310fb0c3293fae3c48fb729a29ae59ddb695ff3329d802cff86de WHIRLPOOL 4de426023be0218656238239fce57c8551de4c39d34bc77cfc34f0d19e856408bbc2847b90b81e6003ad8ac4afb514448466bc384fdfa1bec553b793a8b30be3
+MISC ChangeLog 1876 SHA256 2b6f0217d1d929fd4f6ed717635d953f55462a2595ebf78131abb77b2e30ee92 SHA512 b42ce4400630f5bda2c4912dfa38e8556cfc17bdc51a650452bb6ba988b06a8f564196770d84ecd61f3709e7ef811e84898eedf6e96539fe557a4f16f56ac419 WHIRLPOOL ff68908c8faebfb670e2090451625824f076df9a8e5547546d9de6f2020487afafed0038ce61ecdf6bd1fd143c1c978cfd61eb2e77797b02cf57e1d399ef632a
+MISC metadata.xml 680 SHA256 0ccff1fff2e6352b92d96f2c1041d4560d806e4a3ad11d2cc2118d970f9f3f13 SHA512 f41bc3b5ab68a681b6c947b7d14c3b8c005191fde763e71850910ff995251778ec2b58a992582ca737bbd11f5c71770782b491a04ce88c0f3f83ea73d8c725d5 WHIRLPOOL 89fcafd4d3ace1c1dc4a7fd182c8c52d7462f8b140bcd041ef29417bec9fd532f5cf86e3f8de5721b5eb496c3661789c1c5e25d92b599547b07456ae1ea5d8a4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRrqh2AAoJEKXdFCfdEflKTbEP/A0+2WdS5D6/1474Gk1O7Tq/
-6jyLlJ1wqew6db66bMHKu/XUyKSLajwfS9KY14ViI6zio0G5DvhaoAAohWi12Op6
-ojsYAZ3NGcFsCazYQzNdWLVQj4fqBXx5poK2UuqVsdlTFgApJYcss6y534kSz/Su
-h3aK/0W3sREsXnnnTm9qLaJcP43CEnS8ZbG+09V8s14Mlj/J071aXKYkJVPej3IV
-OYcMOkNISRGENFwam7NXOVcYb1Ru3ymojmEYQ9NXmpJ/aCCLja+uJmpKEYiveOy2
-NxJPe2ZOW/IADxnus3SSljfM+AnVQIJNiZi3OrhC0O1n1UWR5TNdh4CuYBKSrE4b
-NBzu0KgcnjGFkbjruO+rbspF2mEGygY5ms+XyeJLCUu1TB8m5rVIGzQbNL4ZdbrC
-uoZxEa01T+S5ZCClZRbJ38ZGze9ES2A3Q7bQ6IKwN8WgNyjeQ67ZR1QGjMopsHnp
-bvL7VtSwCc6PsVfb5dF6f7m/YvEKeD4UwrZ7REtG0kEU9yxviC0xmLUeBexrOoTA
-VempvsMVdvvLs/bnyo8fggdQPURM3eDH+nSAdYsdFw047zfHFeu6uWSAbNt646wc
-S7kRzne2gMGiZfjy/jDGTA3bp8TopP4eZ5fTpvuJJakRj28vbHzOlxrRBReQuf7G
-JjNP9BHtLuOhOULzEBQM
-=+aAF
+iQIcBAEBCgAGBQJRv2jAAAoJEKXdFCfdEflK6RUP+gPLbnoWTb/pFc4IhHucyEJS
+e3aT5oUuq4p/+oIey5HjHwADNjv63cK018V5O+ba7GcPD12vSerWwxo+kwWcDNpq
+JCE/TsArEgaO2xcsiwS9tvbu4cbCHrZEBJigGQ/JbYwjWXBNwXfR1YhTjJ4qE+ii
+s9g/Vj6h3XXZPGeS63OZb7j1HzSNRsr7rHQJjH0cDYScAinf0HHj+lqhtnuqPK3C
+sume51PRdHDESmrbEd7l6fWZ5sqHN2BHpJ1iD3crADEz9Icl9u6Y2+cOvC6qJSCi
+Dwk9OHn0YRHpfX/7cDili5aSHY19dnnq7WUpR8yVzO8rwCpBa8Kv+UQisWMOwHig
+fJ9V+uvA7CCFHL/IjIVr6yxnqNgj4xd8NllTaj3ROeIW4fb8aaJffk8QOZdJjgZa
+T9/tE5V42/nRqi9QhjDwVZdcxNN3PPJW4trQ0W49Oy/OqhgpOz7QBm3vMkHdF9io
+zH/PX4eGUbMdMkhFNAPHTh1cELnQuXIcJf4dCa9r/05b98V9EFo0lrjwtXpFpys8
+bbXmf7ZLp2z/CEwUle0PnVHloZBsoh5Y1oqvTiVtULmQBySfMiuKDYrXYGc2iOvT
+tHFSye9e6bzyy30MnspBUvq0nhlddmBk2pBPJHOmmXgzB8t8V42oQlMm+ooFEf7B
+IQxIl9I2/P7dVj7g/veQ
+=01iG
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.0.2.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.0.2.ebuild
new file mode 100644
index 000000000000..fa0377eaf6fd
--- /dev/null
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.0.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gr-osmosdr/gr-osmosdr-0.0.2.ebuild,v 1.1 2013/06/17 19:49:46 zerochaos Exp $
+
+EAPI=5
+PYTHON_DEPEND="python? 2"
+
+inherit cmake-utils python
+
+DESCRIPTION="GNU Radio source block for OsmoSDR and rtlsdr and hackrf"
+HOMEPAGE="http://sdr.osmocom.org/trac/wiki/GrOsmoSDR"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-2
+	SRC_URI=""
+	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+IUSE="fcd hackrf iqbalance osmosdr python rtlsdr uhd"
+#IUSE="fcd hackrf iqbalance osmosdr python rtlsdr uhd"
+
+#	osmosdr? ( net-libs/libosmosdr:= )
+RDEPEND="<net-wireless/gnuradio-3.7:0=[fcd?]
+	hackrf? ( net-libs/libhackrf:= )
+	iqbalance? ( net-wireless/gr-iqbal:= )
+	rtlsdr? ( net-wireless/rtl-sdr:= )
+	uhd? ( net-wireless/uhd:= )"
+DEPEND="${RDEPEND}
+	dev-python/cheetah"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	python_convert_shebangs -q -r 2 "${S}"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		$(cmake-utils_use_enable fcd)
+		$(cmake-utils_use_enable hackrf)
+		$(cmake-utils_use_enable iqbalance)
+		$(cmake-utils_use_enable mirisdr MIRI)
+		$(cmake-utils_use_enable osmosdr)
+		$(cmake-utils_use_enable python)
+		$(cmake-utils_use_enable rtlsdr RTL)
+		$(cmake-utils_use_enable uhd)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
index af206bf834f2..58e4616b9d18 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild,v 1.8 2013/06/05 02:37:09 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild,v 1.9 2013/06/17 19:49:46 zerochaos Exp $
 
 EAPI=5
-PYTHON_DEPEND="2"
+PYTHON_DEPEND="python? 2"
 
 inherit cmake-utils python
 
@@ -16,17 +16,22 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
 	KEYWORDS=""
 else
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
+	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/boost
-	>=net-wireless/gnuradio-3.7:0=
-	net-wireless/rtl-sdr"
+SLOT="0/${PV}"
+IUSE="fcd hackrf iqbalance mirisdr osmosdr python rtlsdr uhd"
+#IUSE="fcd hackrf iqbalance mirisdr osmosdr python rtlsdr uhd"
+
+#	osmosdr? ( net-libs/libosmosdr:= )
+RDEPEND="<net-wireless/gnuradio-3.7:0=[fcd?]
+	hackrf? ( net-libs/libhackrf:= )
+	iqbalance? ( net-wireless/gr-iqbal:= )
+	mirisdr? ( net-libs/libmirisdr:= )
+	rtlsdr? ( net-wireless/rtl-sdr:= )
+	uhd? ( net-wireless/uhd:= )"
 DEPEND="${RDEPEND}
 	dev-python/cheetah"
 
@@ -38,3 +43,19 @@ pkg_setup() {
 src_prepare() {
 	python_convert_shebangs -q -r 2 "${S}"
 }
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		$(cmake-utils_use_enable fcd)
+		$(cmake-utils_use_enable hackrf)
+		$(cmake-utils_use_enable iqbalance)
+		$(cmake-utils_use_enable mirisdr MIRI)
+		$(cmake-utils_use_enable osmosdr)
+		$(cmake-utils_use_enable python)
+		$(cmake-utils_use_enable rtlsdr RTL)
+		$(cmake-utils_use_enable uhd)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/net-wireless/gr-osmosdr/metadata.xml b/net-wireless/gr-osmosdr/metadata.xml
index c1b4dee070d2..546349af055c 100644
--- a/net-wireless/gr-osmosdr/metadata.xml
+++ b/net-wireless/gr-osmosdr/metadata.xml
@@ -2,5 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>radio</herd>
+<use>
+	<flag name="fcd">Build with Funcube Dongle support</flag>
+	<flag name="hackrf">Build with Great Scott Gadgets "HackRF" support</flag>
+	<flag name="iqbalance">Enable support for I/Q balancing using gr-iqbal</flag>
+	<flag name="mirisdr">Build with Mirics MSi2500 + MSi001 SDR support</flag>
+	<flag name="osmosdr">Build with Osmocom Osmosdr support</flag>
+	<flag name="rtlsdr">Build with Realtek RTL2832U (rtlsdr) support</flag>
+	<flag name="uhd">Build with Ettus Research USRP Hardware Driver support</flag>
+</use>
 </pkgmetadata>