From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 76FDD138334 for ; Wed, 4 Dec 2019 00:25:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA19FE0856; Wed, 4 Dec 2019 00:25:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 65ADDE0856 for ; Wed, 4 Dec 2019 00:25:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A32E534D780 for ; Wed, 4 Dec 2019 00:25:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9A06C8C7 for ; Wed, 4 Dec 2019 00:25:47 +0000 (UTC) From: "Rick Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Rick Farina" Message-ID: <1575419149.c7b7c4910acf50cb7cc363be93fd721259280850.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/gr-osmosdr/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/gr-osmosdr/Manifest net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r4.ebuild net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r5.ebuild net-wireless/gr-osmosdr/gr-osmosdr-0.1.5.ebuild net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild net-wireless/gr-osmosdr/metadata.xml X-VCS-Directories: net-wireless/gr-osmosdr/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: c7b7c4910acf50cb7cc363be93fd721259280850 X-VCS-Branch: master Date: Wed, 4 Dec 2019 00:25:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0120f79a-e699-4e71-90bc-e190bdd364f5 X-Archives-Hash: 3c4c03407d51dbe007d2ee5d4c46d892 commit: c7b7c4910acf50cb7cc363be93fd721259280850 Author: Rick Farina gentoo org> AuthorDate: Wed Dec 4 00:25:02 2019 +0000 Commit: Rick Farina gentoo org> CommitDate: Wed Dec 4 00:25:49 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7b7c491 net-wireless/gr-osmosdr: add airspy support cosmetic version bump to match upstream Package-Manager: Portage-2.3.80, Repoman-2.3.19 Signed-off-by: Rick Farina gentoo.org> net-wireless/gr-osmosdr/Manifest | 1 + .../gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r5.ebuild | 2 -- ...0.1.4_p20180626-r4.ebuild => gr-osmosdr-0.1.5.ebuild} | 16 ++++++---------- net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild | 16 ++++++---------- net-wireless/gr-osmosdr/metadata.xml | 1 + 5 files changed, 14 insertions(+), 22 deletions(-) diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest index c2b2cbbba87..f79d0e5e0b5 100644 --- a/net-wireless/gr-osmosdr/Manifest +++ b/net-wireless/gr-osmosdr/Manifest @@ -1 +1,2 @@ DIST gr-osmosdr-0.1.4_p20180626.tar.xz 179568 BLAKE2B 223d23bd17edd5f4ee78237e509c79e5e7e49bbfb516009c3b5a715f386fcd138beea48e417d4576a7749cdb440736b6d92c8766b614bf617ef6b2bb4a293fda SHA512 8540da1f4d6936e0a97fa2f3e24af1866d44620fd7e7bc65b323364f67f1527fe8e0efd7bf0349be5e3d61f2ed24fa736c924ea0038e44fa3ab72848fe254a28 +DIST gr-osmosdr-0.1.5.tar.gz 278257 BLAKE2B f63704bd8d7e1fc86cfab256e8813716ac56a4b962f37d9e027df6234ee8e6d78a9d8459408d31ace4a3d6f46edfca0cc1eb9c1004b7052332ead1528cc5ec4b SHA512 5c028dcacf3cb94696eecdd31f4f09b31158c8ce12646d577535ba20942103899e5e21f001f2dd7d0a56eb58f17c2aa849139b495c61e21b60dd6678444b0983 diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r5.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r5.ebuild index 08764526720..75a47d73672 100644 --- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r5.ebuild +++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r5.ebuild @@ -13,14 +13,12 @@ if [[ ${PV} == 9999* ]]; then inherit git-r3 SRC_URI="" EGIT_REPO_URI="git://git.osmocom.org/${PN}.git" - KEYWORDS="" else #SRC_URI="http://cgit.osmocom.org/gr-osmosdr/snapshot/gr-osmosdr-${PV}.tar.xz" #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="" fi LICENSE="GPL-3" diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r4.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5.ebuild similarity index 77% rename from net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r4.ebuild rename to net-wireless/gr-osmosdr/gr-osmosdr-0.1.5.ebuild index 67f6413233c..780a3c706b8 100644 --- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r4.ebuild +++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python2_7 ) inherit cmake-utils python-single-r1 @@ -11,25 +11,20 @@ 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="" + EGIT_REPO_URI="https://github.com/osmocom/gr-osmosdr.git" else - #SRC_URI="http://cgit.osmocom.org/gr-osmosdr/snapshot/gr-osmosdr-${PV}.tar.xz" - #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" + SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm ~x86" fi LICENSE="GPL-3" SLOT="0/${PV}" -IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd" +IUSE="airspy bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd" RDEPEND="${PYTHON_DEPS} dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}] + airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] ) @@ -48,6 +43,7 @@ src_configure() { -DENABLE_DEFAULT=OFF -DPYTHON_EXECUTABLE="${PYTHON}" -DENABLE_FILE=ON + -DENABLE_AIRSPY="$(usex airspy)" -DENABLE_BLADERF="$(usex bladerf)" -DENABLE_FCD="$(usex fcd)" -DENABLE_HACKRF="$(usex hackrf)" diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild index 67f6413233c..780a3c706b8 100644 --- a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild +++ b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python2_7 ) inherit cmake-utils python-single-r1 @@ -11,25 +11,20 @@ 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="" + EGIT_REPO_URI="https://github.com/osmocom/gr-osmosdr.git" else - #SRC_URI="http://cgit.osmocom.org/gr-osmosdr/snapshot/gr-osmosdr-${PV}.tar.xz" - #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" + SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm ~x86" fi LICENSE="GPL-3" SLOT="0/${PV}" -IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd" +IUSE="airspy bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd" RDEPEND="${PYTHON_DEPS} dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}] + airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] ) @@ -48,6 +43,7 @@ src_configure() { -DENABLE_DEFAULT=OFF -DPYTHON_EXECUTABLE="${PYTHON}" -DENABLE_FILE=ON + -DENABLE_AIRSPY="$(usex airspy)" -DENABLE_BLADERF="$(usex bladerf)" -DENABLE_FCD="$(usex fcd)" -DENABLE_HACKRF="$(usex hackrf)" diff --git a/net-wireless/gr-osmosdr/metadata.xml b/net-wireless/gr-osmosdr/metadata.xml index b55e17a0636..daafe681c99 100644 --- a/net-wireless/gr-osmosdr/metadata.xml +++ b/net-wireless/gr-osmosdr/metadata.xml @@ -6,6 +6,7 @@ Radio + Build with Airspy support Build with Nuand BladeRF support Build with Funcube Dongle support Build with Great Scott Gadgets HackRF support