commit: c2eb616dbf0120f8bb26928723790923d52a386b Author: Rick Farina <zerochaos <AT> gentoo <DOT> org> AuthorDate: Mon Apr 22 17:39:54 2019 +0000 Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org> CommitDate: Mon Apr 22 17:40:06 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2eb616d
net-wireless/gnuradio: new maint bump Package-Manager: Portage-2.3.64, Repoman-2.3.12 Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org> net-wireless/gnuradio/Manifest | 3 +- net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild | 239 --------------------- ...3.7.13.4-r2.ebuild => gnuradio-3.7.13.5.ebuild} | 4 +- 3 files changed, 3 insertions(+), 243 deletions(-) diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest index 878211ab0df..fd4e458edd2 100644 --- a/net-wireless/gnuradio/Manifest +++ b/net-wireless/gnuradio/Manifest @@ -1,5 +1,4 @@ DIST gnuradio-3.6.5.1.tar.gz 3150283 BLAKE2B f04121aab9a1b4c5424b5396c96269a53dd6302bf42e5a443b99ea642c8db8ed32df843a89ffe49869212cd2325b209407b5407dbd9b7730510c4ee42bd95836 SHA512 23a22aed482da11005b17e5197ee3ba24d442b30309522b0858e694b58f46b76cc050143d365623c7dd4241cdf8b9f988e1a4dabe2e1f98d0fd4cca71bbb82e8 -DIST gnuradio-3.7.11.tar.gz 4357123 BLAKE2B ae43e9f7e20605de484c4dc31bc33b9b99e5fba269d8d394e9053f4451083b2d6048c1d1fe19a774c0cc686c13e758f0b6e719cf15d05c5867e2ac1c4eecf789 SHA512 a3b44e04e63056ad5238ddbda7967ebaf5802d2ed7e24649190bde67a533b50780ec1260dc7710c5388c966b71e153d3d21468bbfee4529c62ac5b89b589dd14 DIST gnuradio-3.7.13-1-qt5.tar.xz 31412 BLAKE2B 56aebd5ea61abd48723ed0c16050a05c3c8e328ac2a91307b00d8705ddcac0c713d74b946491bdd763abd5d2432d07cd51a85a4d365ef3c8d51eb255e682e326 SHA512 952c5bbf3ae38e2a935cd8dbd20f2f7aed4ab8c0492e3bc10ebed2b9eb1f11bb2caf84c035cd3d88f7703e84f1e58d8aa0a66290623c7b75e59b43a85de44549 DIST gnuradio-3.7.13-codec2.tar.xz 13148 BLAKE2B 84f732dc562dbbd076e1656fad37c818fd9fa869b81f343d45b086659a6df1dc4e26afdb8f283b83c758f76e9d3b90e51ce32e396fbb03d1c0348d27ba9e2c1c SHA512 f9e034ff240b836e336b48900a3b6a86a656ec4f35a9df639503ab99cf8da6acfc6e8d45f11c81994766d9d5bb381671fc678abd0280ebc0e218bcd8523a3f1b -DIST gnuradio-3.7.13.4.tar.gz 4546663 BLAKE2B 82ac5fcf0318825dbdb78be3e5a11a8372b0d2f8e12b955a7e13f6f7e885fda8ac31acbc8cb0b81159b124bcda955e4b7b2cb141c8c0d780122abf7dd33b5aa3 SHA512 85c265851b43d4b62590869c91a9b7b262601dce233515096f1a1e68a14ea2710f08cc07859326efdfde29a2f156477d3bbd42e3bdd9b8ac13f6769637bf794b +DIST gnuradio-3.7.13.5.tar.xz 2976120 BLAKE2B 67aea67b0bd87994f8b4bf89405f410dc08c9fc603a0a59579036b28e575c864df28a0b43e2163fc6ec834fdeb015f110295cdca3aa4256d15e1d223d31579d3 SHA512 cf25491b81d317cd0cdfc70203695c4e819676bc6771c25e85fc62873e6e28d6ea3b9f0387e693976fa072fa1cfe9c9a503e4958ec658e2e0a6768752c61fb15 diff --git a/net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild b/net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild deleted file mode 100644 index f7a017d103c..00000000000 --- a/net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild +++ /dev/null @@ -1,239 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -CMAKE_BUILD_TYPE="None" -inherit cmake-utils eutils gnome2-utils python-single-r1 xdg-utils - -DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios" -HOMEPAGE="https://www.gnuradio.org/"; -LICENSE="GPL-3" -SLOT="0/${PV}" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"; - inherit git-r3 - KEYWORDS="" -else - SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz"; - KEYWORDS="~amd64 ~arm ~x86" -fi - -IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq" -#tests are entirely broken on newer gcc even with -fpermissive added to *FLAGS -RESTRICT=test - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - audio? ( || ( alsa oss jack portaudio ) ) - alsa? ( audio ) - oss? ( audio ) - jack? ( audio ) - portaudio? ( audio ) - analog? ( filter ) - digital? ( filter analog ) - dtv? ( fec ) - pager? ( filter analog ) - uhd? ( filter analog ) - fcd? ( || ( alsa oss ) ) - wavelet? ( analog ) - wxwidgets? ( filter analog )" - -# bug #348206 -# comedi? ( >=sci-electronics/comedilib-0.8 ) -# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669 -RDEPEND="${PYTHON_DEPS} - >=dev-lang/orc-0.4.12 - dev-libs/boost:0=[${PYTHON_USEDEP}] - !<=dev-libs/boost-1.52.0-r6:0/1.52 - dev-python/numpy[${PYTHON_USEDEP}] - sci-libs/fftw:3.0= - alsa? ( - media-libs/alsa-lib:= - ) - fcd? ( virtual/libusb:1 ) - filter? ( sci-libs/scipy ) - grc? ( - dev-python/cheetah[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - >=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}] - ) - jack? ( - media-sound/jack-audio-connection-kit - ) - log? ( dev-libs/log4cpp ) - portaudio? ( - >=media-libs/portaudio-19_pre - ) - 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 ) - wavelet? ( - >=sci-libs/gsl-1.10 - ) - wxwidgets? ( - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/wxpython:3.0[${PYTHON_USEDEP}] - ) - zeromq? ( >=net-libs/zeromq-2.1.11 ) - " - -DEPEND="${RDEPEND} - app-text/docbook-xml-dtd:4.2 - >=dev-lang/swig-3.0.5 - dev-python/cheetah[${PYTHON_USEDEP}] - virtual/pkgconfig - doc? ( - >=app-doc/doxygen-1.5.7.1 - dev-python/sphinx[${PYTHON_USEDEP}] - ) - grc? ( x11-misc/xdg-utils ) - oss? ( virtual/os-headers ) - test? ( >=dev-util/cppunit-1.9.14 ) - zeromq? ( net-libs/cppzmq ) -" - -src_prepare() { - gnome2_environment_reset #534582 - - epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch - # Useless UI element would require qt3support, bug #365019 - sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die - cmake-utils_src_prepare -} - -src_configure() { - # SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX - #audio provider is still automagic - #zeromq missing deps isn't fatal - #remaining QA issues, these appear broken: - #ENABLE_ENABLE_PERFORMANCE_COUNTERS - #ENABLE_GR_AUDIO_ALSA - #ENABLE_GR_AUDIO_JACK - #ENABLE_GR_AUDIO_OSS - #ENABLE_GR_AUDIO_PORTAUDIO - #ENABLE_GR_CORE - mycmakeargs=( - -DENABLE_DEFAULT=OFF - -DENABLE_GNURADIO_RUNTIME=ON - -DENABLE_VOLK=ON - -DENABLE_PYTHON=ON - -DENABLE_GR_BLOCKS=ON - -DENABLE_GR_FFT=ON - -DENABLE_GR_AUDIO=ON - -DENABLE_GR_AUDIO_ALSA="$(usex alsa)" - -DENABLE_GR_ANALOG="$(usex analog)" - -DENABLE_GR_ATSC="$(usex atsc)" - -DENABLE_GR_CHANNELS="$(usex channels)" - -DENABLE_GR_DIGITAL="$(usex digital)" - -DENABLE_DOXYGEN="$(usex doc)" - -DENABLE_SPHINX="$(usex doc)" - -DENABLE_GR_DTV="$(usex dtv)" - -DENABLE_GR_FCD="$(usex fcd)" - -DENABLE_GR_FEC="$(usex fec)" - -DENABLE_GR_FILTER="$(usex filter)" - -DENABLE_GRC="$(usex grc)" - -DENABLE_GR_AUDIO_JACK="$(usex jack)" - -DENABLE_GR_LOG="$(usex log)" - -DENABLE_GR_NOAA="$(usex noaa)" - -DENABLE_GR_AUDIO_OSS="$(usex oss)" - -DENABLE_GR_PAGER="$(usex pager)" - -DENABLE_ENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)" - -DENABLE_GR_AUDIO_PORTAUDIO="$(usex portaudio)" - -DENABLE_TESTING="$(usex test)" - -DENABLE_GR_TRELLIS="$(usex trellis)" - -DENABLE_GR_UHD="$(usex uhd)" - -DENABLE_GR_UTILS="$(usex utils)" - -DENABLE_GR_VOCODER="$(usex vocoder)" - -DENABLE_GR_WAVELET="$(usex wavelet)" - -DENABLE_GR_WXGUI="$(usex wxwidgets)" - -DENABLE_GR_QTGUI=OFF - -DENABLE_GR_VIDEO_SDL="$(usex sdl)" - -DENABLE_GR_ZEROMQ="$(usex zeromq)" - -DENABLE_GR_CORE=ON - -DSYSCONFDIR="${EPREFIX}"/etc - -DPYTHON_EXECUTABLE="${PYTHON}" - -DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" - ) - use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - if use examples ; then - dodir /usr/share/doc/${PF}/ - mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die - docompress -x /usr/share/doc/${PF}/examples - else - # It seems that the examples are always installed - rm -rf "${ED}"/usr/share/${PN}/examples || die - fi - - if use doc || use examples; then - #this doesn't appear useful - rm -rf "${ED}"/usr/share/doc/${PF}/xml || die - fi - - # We install the mimetypes to the correct locations from the ebuild - rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die - rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die - - # Install icons, menu items and mime-types for GRC - if use grc ; then - local fd_path="${S}/grc/scripts/freedesktop" - insinto /usr/share/mime/packages - doins "${fd_path}/${PN}-grc.xml" - - domenu "${fd_path}/"*.desktop - doicon "${fd_path}/"*.png - fi - - python_fix_shebang "${ED}" -} - -src_test() -{ - ctest -E qtgui -} - -pkg_postinst() -{ - local GRC_ICON_SIZES="32 48 64 128 256" - - if use grc ; then - xdg_desktop_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 \ - || die "icon resource installation failed" - xdg-icon-resource install --noupdate --context apps --size ${size} \ - "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \ - || die "icon resource installation failed" - done - xdg-icon-resource forceupdate - fi -} - -pkg_postrm() -{ - local GRC_ICON_SIZES="32 48 64 128 256" - - if use grc ; then - xdg_desktop_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" - xdg-icon-resource uninstall --noupdate --context apps --size ${size} \ - gnuradio-grc || ewarn "icon uninstall failed" - - done - xdg-icon-resource forceupdate - fi -} diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.4-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild similarity index 98% rename from net-wireless/gnuradio/gnuradio-3.7.13.4-r2.ebuild rename to net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild index eab46b2eca5..354d6e7b959 100644 --- a/net-wireless/gnuradio/gnuradio-3.7.13.4-r2.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,7 +17,7 @@ if [[ ${PV} =~ "9999" ]]; then inherit git-r3 KEYWORDS="" else - SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz + SRC_URI="https://github.com/gnuradio/gnuradio/releases/download/v${PV}/${P}.tar.xz https://dev.gentoo.org/~zerochaos/patches/${PN}-3.7.13-1-qt5.tar.xz https://dev.gentoo.org/~zerochaos/patches/${PN}-3.7.13-codec2.tar.xz"; KEYWORDS="~amd64 ~arm ~x86"
