version bump

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

3 files changed, 85 insertions, 6 deletions

diff --git a/net-wireless/gr-osmosdr/ChangeLog b/net-wireless/gr-osmosdr/ChangeLog
index f9da010751b1..da5e79d30d3d 100644
--- a/net-wireless/gr-osmosdr/ChangeLog
+++ b/net-wireless/gr-osmosdr/ChangeLog
@@ -1,6 +1,12 @@
 # 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.19 2013/09/16 16:03:12 zerochaos Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gr-osmosdr/ChangeLog,v 1.20 2014/07/06 21:25:41 zerochaos Exp $
+
+*gr-osmosdr-0.1.1 (06 Jul 2014)
+
+  06 Jul 2014; Rick Farina <zerochaos@gentoo.org> +gr-osmosdr-0.1.1.ebuild,
+  gr-osmosdr-9999.ebuild:
+  version bump
 
 *gr-osmosdr-0.1.0-r2 (16 Sep 2013)
 *gr-osmosdr-0.0.2-r1 (16 Sep 2013)
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.1.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.1.ebuild
new file mode 100644
index 000000000000..a106fdfc0424
--- /dev/null
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2014 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.1.1.ebuild,v 1.1 2014/07/06 21:25:41 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-r3
+	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 python rtlsdr uhd"
+#IUSE="fcd hackrf iqbalance mirisdr osmosdr python rtlsdr uhd"
+
+#	osmosdr? ( net-libs/libosmosdr:= )
+
+#from "git show v0.1.1"
+#gnuradio 3.7.3
+#uhd 003.007.000-1-ga8caec5f
+#librtlsdr v0.5.3-5-g6ee5
+#libosmosdr v0.1-43-gb697
+#libmirisdr 3174
+#libhackrf 0.3
+#gr-iqbal v0.37.1-5-gd4fd4dd4
+#libairspy 9350af1a
+#libbladeRF 0.14.0-git-d9db543
+#gr-fcdproplus 1edbe523
+
+RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[fcd?]
+	hackrf? ( net-libs/libhackrf:= )
+	iqbalance? ( net-wireless/gr-iqbal:= )
+	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= )
+	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 python)
+		$(cmake-utils_use_enable rtlsdr RTL)
+		$(cmake-utils_use_enable rtlsdr RTL_TCP)
+		$(cmake-utils_use_enable uhd)
+	)
+#		$(cmake-utils_use_enable osmosdr)
+
+	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 6f7262961638..fc650f9d19e0 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.13 2013/09/16 16:03:12 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild,v 1.14 2014/07/06 21:25:41 zerochaos Exp $
 
 EAPI=5
 PYTHON_DEPEND="python? 2"
@@ -11,7 +11,7 @@ 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
+	inherit git-r3
 	SRC_URI=""
 	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
 	KEYWORDS=""
@@ -30,7 +30,7 @@ RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[fcd?]
 	hackrf? ( net-libs/libhackrf:= )
 	iqbalance? ( net-wireless/gr-iqbal:= )
 	mirisdr? ( net-libs/libmirisdr:= )
-	rtlsdr? ( net-wireless/rtl-sdr:= )
+	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= )
 	uhd? ( net-wireless/uhd:= )"
 DEPEND="${RDEPEND}
 	dev-python/cheetah"