version bump

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

4 files changed, 87 insertions, 3 deletions

diff --git a/net-wireless/gr-osmosdr/ChangeLog b/net-wireless/gr-osmosdr/ChangeLog
index 99241d79e91e..719907b05c22 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gr-osmosdr/ChangeLog,v 1.22 2014/07/25 05:00:25 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gr-osmosdr/ChangeLog,v 1.23 2014/08/27 01:32:39 zerochaos Exp $
+
+*gr-osmosdr-0.1.2 (27 Aug 2014)
+
+  27 Aug 2014; Rick Farina <zerochaos@gentoo.org> +gr-osmosdr-0.1.2.ebuild,
+  gr-osmosdr-0.1.1.ebuild, gr-osmosdr-9999.ebuild:
+  version bump
 
   25 Jul 2014; Rick Farina <zerochaos@gentoo.org> gr-osmosdr-0.1.1.ebuild,
   gr-osmosdr-9999.ebuild, metadata.xml:
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.1.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.1.ebuild
index 8282c9f1f55d..a047d76eb27a 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.1.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.1.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/gr-osmosdr/gr-osmosdr-0.1.1.ebuild,v 1.2 2014/07/25 05:00:25 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gr-osmosdr/gr-osmosdr-0.1.1.ebuild,v 1.3 2014/08/27 01:32:39 zerochaos Exp $
 
 EAPI=5
 PYTHON_DEPEND="python? 2"
@@ -54,6 +54,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch_user
 	python_convert_shebangs -q -r 2 "${S}"
 }
 
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.2.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.2.ebuild
new file mode 100644
index 000000000000..e80693511608
--- /dev/null
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.2.ebuild
@@ -0,0 +1,76 @@
+# 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.2.ebuild,v 1.1 2014/08/27 01:32:39 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
+	#git archive --format=tar --prefix=gr-osmosdr-${PV}/ v${PV} | xz > ../gr-osmosdr-${PV}.tar.xz
+	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+IUSE="bladerf fcd hackrf iqbalance python rtlsdr uhd"
+#IUSE="bladerf fcd hackrf iqbalance mirisdr osmosdr python rtlsdr uhd"
+
+#	osmosdr? ( net-libs/libosmosdr:= )
+
+#from "git show v${PV}"
+#gr-iqbal 44ab02f6
+#gr-fcdproplus 1edbe523
+#uhd d99ce4ef99
+#librtlsdr v0.5.3-6-gd447
+#libmirisdr 3174
+#libosmosdr v0.1-43-gb697
+#libhackrf 635d429a
+#libbladeRF af887e5d
+#libairspy b4c38a71
+
+RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[fcd?]
+	bladerf? ( net-wireless/bladerf:= )
+	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() {
+	epatch_user
+	python_convert_shebangs -q -r 2 "${S}"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		$(cmake-utils_use_enable bladerf)
+		$(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 3a7316c49fe3..ceb0e6e7814f 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-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.15 2014/07/25 05:00:25 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild,v 1.16 2014/08/27 01:32:39 zerochaos Exp $
 
 EAPI=5
 PYTHON_DEPEND="python? 2"
@@ -16,6 +16,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
 	KEYWORDS=""
 else
+	#git archive --format=tar --prefix=gr-osmosdr-${PV}/ v${PV} | xz > ../gr-osmosdr-${PV}.tar.xz
 	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi