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

(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)

4 files changed, 107 insertions, 10 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/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>