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 B80A31382C5 for ; Thu, 22 Feb 2018 04:21:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CBE53E0809; Thu, 22 Feb 2018 04:21:15 +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 9DEA6E0809 for ; Thu, 22 Feb 2018 04:21:15 +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 BF213335C43 for ; Thu, 22 Feb 2018 04:21:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DBCB9211 for ; Thu, 22 Feb 2018 04:21:09 +0000 (UTC) From: "Richard 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, "Richard Farina" Message-ID: <1519273254.8e746e8da0895bbf684431a93cc3c021df9b73c4.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/gnuradio/gnuradio-3.7.9999.ebuild net-wireless/gnuradio/gnuradio-3.8.9999.ebuild net-wireless/gnuradio/gnuradio-9999.ebuild X-VCS-Directories: net-wireless/gnuradio/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Richard Farina X-VCS-Revision: 8e746e8da0895bbf684431a93cc3c021df9b73c4 X-VCS-Branch: master Date: Thu, 22 Feb 2018 04:21:09 +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-Archives-Salt: f10223f3-6d66-4ab3-b086-fa1f444210f0 X-Archives-Hash: fb963513ac72b03264227b2398ad7e71 commit: 8e746e8da0895bbf684431a93cc3c021df9b73c4 Author: Zero_Chaos gentoo org> AuthorDate: Thu Feb 22 04:20:54 2018 +0000 Commit: Richard Farina gentoo org> CommitDate: Thu Feb 22 04:20:54 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e746e8d net-wireless/gnuradio: I heard you like gnuradio so I added gnuradio to your gnuradio so you can next while you maint Package-Manager: Portage-2.3.24, Repoman-2.3.6 .../{gnuradio-9999.ebuild => gnuradio-3.7.9999.ebuild} | 13 +++++++++++-- .../{gnuradio-9999.ebuild => gnuradio-3.8.9999.ebuild} | 13 +++++++++++-- net-wireless/gnuradio/gnuradio-9999.ebuild | 13 +++++++++++-- 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild similarity index 96% copy from net-wireless/gnuradio/gnuradio-9999.ebuild copy to net-wireless/gnuradio/gnuradio-3.7.9999.ebuild index 32a66381ccf..6e4c8e7f78f 100644 --- a/net-wireless/gnuradio/gnuradio-9999.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="http://gnuradio.org/" LICENSE="GPL-3" SLOT="0/${PV}" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} =~ "9999" ]]; then EGIT_REPO_URI="https://gnuradio.org/git/gnuradio.git" inherit git-r3 KEYWORDS="" @@ -20,6 +20,11 @@ else SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz" KEYWORDS="~amd64 ~arm ~x86" fi +if [[ ${PV} == "3.7.9999" ]]; then + EGIT_BRANCH="maint" +elif [[ ${PV} == "3.8.9999" ]]; then + EGIT_BRANCH="next" +fi IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq" @@ -105,7 +110,11 @@ DEPEND="${RDEPEND} src_prepare() { gnome2_environment_reset #534582 - epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch + if [[ ${PV} == "3.8.9999" ]]; then + true + else + epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch + fi # Useless UI element would require qt3support, bug #365019 sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die default diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild similarity index 96% copy from net-wireless/gnuradio/gnuradio-9999.ebuild copy to net-wireless/gnuradio/gnuradio-3.8.9999.ebuild index 32a66381ccf..6e4c8e7f78f 100644 --- a/net-wireless/gnuradio/gnuradio-9999.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="http://gnuradio.org/" LICENSE="GPL-3" SLOT="0/${PV}" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} =~ "9999" ]]; then EGIT_REPO_URI="https://gnuradio.org/git/gnuradio.git" inherit git-r3 KEYWORDS="" @@ -20,6 +20,11 @@ else SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz" KEYWORDS="~amd64 ~arm ~x86" fi +if [[ ${PV} == "3.7.9999" ]]; then + EGIT_BRANCH="maint" +elif [[ ${PV} == "3.8.9999" ]]; then + EGIT_BRANCH="next" +fi IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq" @@ -105,7 +110,11 @@ DEPEND="${RDEPEND} src_prepare() { gnome2_environment_reset #534582 - epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch + if [[ ${PV} == "3.8.9999" ]]; then + true + else + epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch + fi # Useless UI element would require qt3support, bug #365019 sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die default diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild index 32a66381ccf..6e4c8e7f78f 100644 --- a/net-wireless/gnuradio/gnuradio-9999.ebuild +++ b/net-wireless/gnuradio/gnuradio-9999.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="http://gnuradio.org/" LICENSE="GPL-3" SLOT="0/${PV}" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} =~ "9999" ]]; then EGIT_REPO_URI="https://gnuradio.org/git/gnuradio.git" inherit git-r3 KEYWORDS="" @@ -20,6 +20,11 @@ else SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz" KEYWORDS="~amd64 ~arm ~x86" fi +if [[ ${PV} == "3.7.9999" ]]; then + EGIT_BRANCH="maint" +elif [[ ${PV} == "3.8.9999" ]]; then + EGIT_BRANCH="next" +fi IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq" @@ -105,7 +110,11 @@ DEPEND="${RDEPEND} src_prepare() { gnome2_environment_reset #534582 - epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch + if [[ ${PV} == "3.8.9999" ]]; then + true + else + epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch + fi # Useless UI element would require qt3support, bug #365019 sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die default