diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
new file mode 100644
index 0000000..756f2e1
--- /dev/null
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -0,0 +1,4 @@
+DIST gr-osmosdr-0.1.4_p20150730.tar.xz 1148596 SHA256 b94e597d8042717d70f5f8c358fb8446ef64a91fa6ab2b362e0e7d37457bd961 SHA512 7e6847eba0d4e217ea71bb4b8105290b329bf8840a7193df013b3a0cd9c9ef57f3686252da48cb0df239288b5794c75178a8bb45ff2a2dd8b605f63fec2426d9 WHIRLPOOL db2df16796ab5974d22d4f606bd73aaec53693933fcc5c12e5126f14e4d3d2eadacd7cf2e28cb18a951caf9a16440c72f54177acfd3af16512febd97d6e0072c
+EBUILD gr-osmosdr-0.1.4_p20150730.ebuild 1920 SHA256 e02119d72b7074a412f16480ab086adc4013062f98d6f5b6989cc2979463ae3f SHA512 a99299d2a6ef5c09df4076cf82a01024c1da468efb9e658f5d31c63b1f6020efe5eeda98f218a747b5164811356c35a5d0bbc75d794a69bb9b90071338f54720 WHIRLPOOL 4c6b837840cd20ffcb354dfdeed73fa45bf8a81d40803541799e55f34aaff143b74e252b067019fe33feea653286d793792d67e88fee4c3be6ea81d58a7bca0f
+EBUILD gr-osmosdr-9999.ebuild 1920 SHA256 e4e37406d0474e315f7a1a6909260578e5fc06168d8336dd3905ab20c726cecd SHA512 304cbf82578e1cfb85c2febc557ad0ec257325a32751e07b3e0aae20c1e56896679f8354154357426d77b0fa0e6543de9e71dc44e49c70ea300965562f99b323 WHIRLPOOL e06cb0559f7d67cf21d7c8c3a9e0466e86b9be4b04d130455f776d5e67dcdc096953c63887ea2ee78a06e76fec4c7bddaa04b611c48862fd6511a7fc7aab8bb3
+MISC metadata.xml 752 SHA256 aaf4a362243890bc6b43748cbb5c28f2ba400afb801c88514e0bc3806be26329 SHA512 3b49428bfa6b62bda1195b6c31c549a1ccf59fce03ce0bed5206a0d5a40386264628930758dbaa64e8a40b657c478076cb9a2f10c7d5ace10547ca5cf00742ae WHIRLPOOL 039452d0e4f720e5d60c1b23d7cd025a9c50c35216b199a118ffd4d38ffd08780cc6144d08254f704901662d1837e27a2e9cca0ed005fe601b8f4062801596d8
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild
new file mode 100644
index 0000000..3732d4f
--- /dev/null
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1
+
+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 clone git://git.osmocom.org/gr-osmosdr.git
+	#cd gr-osmosdr
+	#git archive --format=tar --prefix=gr-osmosdr-${PV}/ v${PV} | xz > ../gr-osmosdr-${PV}.tar.xz
+	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/gr-osmosdr-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="custom"
+SLOT="0/${PV}"
+IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr uhd sdrplay"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=
+	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}]
+	bladerf? ( net-wireless/bladerf:= )
+	hackrf? ( net-libs/libhackrf:= )
+	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
+	mirisdr? ( net-libs/libmirisdr:= )
+	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= )
+	uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/cheetah"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DENABLE_FILE=ON
+		-DENABLE_NONFREE=ON
+		$(cmake-utils_use_enable bladerf)
+		$(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 python)
+		$(cmake-utils_use_enable rtlsdr RTL)
+		$(cmake-utils_use_enable rtlsdr RTL_TCP)
+		$(cmake-utils_use_enable uhd)
+		$(cmake-utils_use_enable sdrplay)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use python; then
+		python_fix_shebang "${ED}"/usr/bin
+	fi
+}
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
new file mode 100644
index 0000000..1da7b29
--- /dev/null
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1
+
+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 clone git://git.osmocom.org/gr-osmosdr.git
+	#cd gr-osmosdr
+	#git archive --format=tar --prefix=gr-osmosdr-${PV}/ v${PV} | xz > ../gr-osmosdr-${PV}.tar.xz
+	SRC_URI="http://cgit.osmocom.org/gr-osmosdr/snapshot/gr-osmosdr-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="custom"
+SLOT="0/${PV}"
+IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr uhd sdrplay"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=
+	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}]
+	bladerf? ( net-wireless/bladerf:= )
+	hackrf? ( net-libs/libhackrf:= )
+	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
+	mirisdr? ( net-libs/libmirisdr:= )
+	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= )
+	uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/cheetah"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DENABLE_FILE=ON
+		-DENABLE_NONFREE=ON
+		$(cmake-utils_use_enable bladerf)
+		$(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 python)
+		$(cmake-utils_use_enable rtlsdr RTL)
+		$(cmake-utils_use_enable rtlsdr RTL_TCP)
+		$(cmake-utils_use_enable uhd)
+		$(cmake-utils_use_enable sdrplay)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use python; then
+		python_fix_shebang "${ED}"/usr/bin
+	fi
+}
diff --git a/net-wireless/gr-osmosdr/metadata.xml b/net-wireless/gr-osmosdr/metadata.xml
new file mode 100644
index 0000000..e8e4487
--- /dev/null
+++ b/net-wireless/gr-osmosdr/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+	<email>radio@gentoo.org</email>
+	<name>Radio</name>
+	</maintainer>
+<use>
+	<flag name="bladerf">Build with Nuand BladeRF support</flag>
+	<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="rtlsdr">Build with Realtek RTL2832U (rtlsdr) support</flag>
+	<flag name="uhd">Build with Ettus Research USRP Hardware Driver support</flag>
+</use>
+</pkgmetadata>