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 ADF4F138334 for ; Tue, 23 Oct 2018 02:36:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70880E0958; Tue, 23 Oct 2018 02:36: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 368BBE0958 for ; Tue, 23 Oct 2018 02:36:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 A4888335C03 for ; Tue, 23 Oct 2018 02:36:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E05DD42B for ; Tue, 23 Oct 2018 02:36:45 +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: <1540262198.e3bfa7d308912fc916b19c86cd79ebd8cea27155.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.13.4-r1.ebuild net-wireless/gnuradio/gnuradio-3.7.13.4.ebuild 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: e3bfa7d308912fc916b19c86cd79ebd8cea27155 X-VCS-Branch: master Date: Tue, 23 Oct 2018 02:36:45 +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: 3950be1d-dc03-4b97-94ba-ff8aad8be485 X-Archives-Hash: c212bfd41bfa5c8ab48b0ecb6e4d8fb5 commit: e3bfa7d308912fc916b19c86cd79ebd8cea27155 Author: Zero_Chaos gentoo org> AuthorDate: Tue Oct 23 02:36:24 2018 +0000 Commit: Richard Farina gentoo org> CommitDate: Tue Oct 23 02:36:38 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3bfa7d3 net-wireless/gnuradio: dep cleanup fix automagic bits, fix missing codec2 deps Signed-off-by: Rick Farina gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 ...dio-3.7.13.4.ebuild => gnuradio-3.7.13.4-r1.ebuild} | 10 ++++++---- net-wireless/gnuradio/gnuradio-3.7.9999.ebuild | 16 +++++++++++----- net-wireless/gnuradio/gnuradio-3.8.9999.ebuild | 18 +++++++++++++----- net-wireless/gnuradio/gnuradio-9999.ebuild | 14 ++++++++++---- 4 files changed, 40 insertions(+), 18 deletions(-) diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.4.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.4-r1.ebuild similarity index 95% rename from net-wireless/gnuradio/gnuradio-3.7.13.4.ebuild rename to net-wireless/gnuradio/gnuradio-3.7.13.4-r1.ebuild index eb3fe3b2645..401a34b7994 100644 --- a/net-wireless/gnuradio/gnuradio-3.7.13.4.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.7.13.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -84,7 +84,7 @@ RDEPEND="${PYTHON_DEPS} uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] ) utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] ) vocoder? ( media-sound/gsm - >=media-libs/codec2-0.8.1 ) + >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) @@ -121,6 +121,10 @@ src_prepare() { epatch "${WORKDIR}"/qt5-maint-00*.patch epatch "${WORKDIR}"/codec2-next-00*.patch + use !alsa && sed -i 's#version.h#version-nonexistant.h#' cmake/Modules/FindALSA.cmake + use !jack && sed -i 's#jack.h#jack-nonexistant.h#' cmake/Modules/FindJack.cmake + use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistant.h#' cmake/Modules/FindPortaudio.cmake + cmake-utils_src_prepare } @@ -220,7 +224,6 @@ pkg_postinst() if use grc ; then xdg_desktop_database_update xdg_mimeinfo_database_update - xdg_mime_database_update for size in ${GRC_ICON_SIZES} ; do xdg-icon-resource install --noupdate --context mimetypes --size ${size} \ "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \ @@ -240,7 +243,6 @@ pkg_postrm() if use grc ; then xdg_desktop_database_update xdg_mimeinfo_database_update - xdg_mime_database_update for size in ${GRC_ICON_SIZES} ; do xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \ application-gnuradio-grc || ewarn "icon uninstall failed" diff --git a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild index ad674115e29..3b3053625af 100644 --- a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -21,7 +21,7 @@ else KEYWORDS="~amd64 ~arm ~x86" fi if [[ ${PV} == "3.7.9999" ]]; then - EGIT_BRANCH="maint" + EGIT_BRANCH="maint-3.7" elif [[ ${PV} == "3.8.9999" ]]; then EGIT_BRANCH="next" fi @@ -72,7 +72,8 @@ RDEPEND="${PYTHON_DEPS} sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] ) utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] ) - vocoder? ( media-sound/gsm ) + vocoder? ( media-sound/gsm + >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) @@ -109,6 +110,11 @@ src_prepare() { fi # Useless UI element would require qt3support, bug #365019 sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die + + use !alsa && sed -i 's#version.h#version-nonexistant.h#' cmake/Modules/FindALSA.cmake + use !jack && sed -i 's#jack.h#jack-nonexistant.h#' cmake/Modules/FindJack.cmake + use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistant.h#' cmake/Modules/FindPortaudio.cmake + cmake-utils_src_prepare } @@ -214,7 +220,7 @@ pkg_postinst() if use grc ; then xdg_desktop_database_update - xdg_mime_database_update + xdg_mimeinfo_database_update for size in ${GRC_ICON_SIZES} ; do xdg-icon-resource install --noupdate --context mimetypes --size ${size} \ "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \ @@ -233,7 +239,7 @@ pkg_postrm() if use grc ; then xdg_desktop_database_update - xdg_mime_database_update + xdg_mimeinfo_database_update for size in ${GRC_ICON_SIZES} ; do xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \ application-gnuradio-grc || ewarn "icon uninstall failed" diff --git a/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild index 8096356bfba..cdc3acd6eeb 100644 --- a/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -75,12 +75,15 @@ RDEPEND="${PYTHON_DEPS} dev-python/PyQt5[opengl,${PYTHON_USEDEP}] dev-qt/qtcore:5 dev-qt/qtgui:5 + dev-qt/qtwidgets:5 x11-libs/qwt:6[qt5(+)] ) sdl? ( >=media-libs/libsdl-1.2.0 ) - uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] ) + uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] + dev-libs/log4cpp ) utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] ) - vocoder? ( media-sound/gsm ) + vocoder? ( media-sound/gsm + >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) @@ -111,6 +114,11 @@ src_prepare() { fi # Useless UI element would require qt3support, bug #365019 sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die + + use !alsa && sed -i 's#version.h#version-nonexistant.h#' cmake/Modules/FindALSA.cmake + use !jack && sed -i 's#jack.h#jack-nonexistant.h#' cmake/Modules/FindJack.cmake + use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistant.h#' cmake/Modules/FindPortaudio.cmake + cmake-utils_src_prepare } @@ -208,7 +216,7 @@ pkg_postinst() if use grc ; then xdg_desktop_database_update - xdg_mime_database_update + xdg_mimeinfo_database_update for size in ${GRC_ICON_SIZES} ; do xdg-icon-resource install --noupdate --context mimetypes --size ${size} \ "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \ @@ -227,7 +235,7 @@ pkg_postrm() if use grc ; then xdg_desktop_database_update - xdg_mime_database_update + xdg_mimeinfo_database_update for size in ${GRC_ICON_SIZES} ; do xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \ application-gnuradio-grc || ewarn "icon uninstall failed" diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild index e2920f5cc5f..6d225009790 100644 --- a/net-wireless/gnuradio/gnuradio-9999.ebuild +++ b/net-wireless/gnuradio/gnuradio-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -73,7 +73,8 @@ RDEPEND="${PYTHON_DEPS} sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] ) utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] ) - vocoder? ( media-sound/gsm ) + vocoder? ( media-sound/gsm + >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) @@ -110,6 +111,11 @@ src_prepare() { fi # Useless UI element would require qt3support, bug #365019 sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die + + use !alsa && sed -i 's#version.h#version-nonexistant.h#' cmake/Modules/FindALSA.cmake + use !jack && sed -i 's#jack.h#jack-nonexistant.h#' cmake/Modules/FindJack.cmake + use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistant.h#' cmake/Modules/FindPortaudio.cmake + cmake-utils_src_prepare } @@ -215,7 +221,7 @@ pkg_postinst() if use grc ; then xdg_desktop_database_update - xdg_mime_database_update + xdg_mimeinfo_database_update for size in ${GRC_ICON_SIZES} ; do xdg-icon-resource install --noupdate --context mimetypes --size ${size} \ "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \ @@ -234,7 +240,7 @@ pkg_postrm() if use grc ; then xdg_desktop_database_update - xdg_mime_database_update + xdg_mimeinfo_database_update for size in ${GRC_ICON_SIZES} ; do xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \ application-gnuradio-grc || ewarn "icon uninstall failed"