zerochaos 15/02/21 22:14:24 Modified: gnuradio-9999.ebuild metadata.xml ChangeLog Added: gnuradio-3.7.6.1-r2.ebuild Removed: gnuradio-3.7.6.1-r1.ebuild Log: remove ctrlport use flag as upstream has, bug #529498. additional minor dep cleanup per depcheck (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)
Revision Changes Path 1.31 net-wireless/gnuradio/gnuradio-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild?rev=1.31&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild?rev=1.31&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild?r1=1.30&r2=1.31 Index: gnuradio-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- gnuradio-9999.ebuild 21 Feb 2015 04:18:42 -0000 1.30 +++ gnuradio-9999.ebuild 21 Feb 2015 22:14:24 -0000 1.31 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild,v 1.30 2015/02/21 04:18:42 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild,v 1.31 2015/02/21 22:14:24 zerochaos Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) @@ -22,7 +22,7 @@ KEYWORDS="~amd64 ~arm ~x86" fi -IUSE="+audio +alsa atsc +analog +digital channels +ctrlport 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" +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" REQUIRED_USE="${PYTHON_REQUIRED_USE} audio? ( || ( alsa oss jack portaudio ) ) @@ -52,7 +52,6 @@ alsa? ( media-libs/alsa-lib[${PYTHON_USEDEP}] ) - ctrlport? ( dev-libs/Ice[python,${PYTHON_USEDEP}] ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( @@ -86,8 +85,7 @@ dev-python/numpy[${PYTHON_USEDEP}] dev-python/wxpython:2.8[${PYTHON_USEDEP}] ) - zeromq? ( >=net-libs/zeromq-2.1.11 - net-libs/cppzmq ) + zeromq? ( >=net-libs/zeromq-2.1.11 ) " DEPEND="${RDEPEND} @@ -98,12 +96,9 @@ >=app-doc/doxygen-1.5.7.1 dev-python/sphinx[${PYTHON_USEDEP}] ) - grc? ( - x11-misc/xdg-utils - ) - oss? ( - virtual/os-headers - ) + grc? ( x11-misc/xdg-utils ) + oss? ( virtual/os-headers ) + zeromq? ( net-libs/cppzmq ) " src_prepare() { @@ -113,7 +108,6 @@ sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die #epatch "${FILESDIR}"/${PN}-3.6.1-automagic-audio.patch #epatch "${FILESDIR}/${P}-build-type-nonfatal.patch" - epatch "${FILESDIR}"/gnuradio-qwt-with-qt5-support.patch } src_configure() { @@ -133,7 +127,6 @@ $(cmake-utils_use_enable analog GR_ANALOG) \ $(cmake-utils_use_enable atsc GR_ATSC) \ $(cmake-utils_use_enable channels GR_CHANNELS) \ - $(cmake-utils_use_enable ctrlport GR_CTRLPORT) \ $(cmake-utils_use_enable digital GR_DIGITAL) \ $(cmake-utils_use_enable doc DOXYGEN) \ $(cmake-utils_use_enable doc SPHINX) \ 1.12 net-wireless/gnuradio/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/gnuradio/metadata.xml?rev=1.12&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/gnuradio/metadata.xml?rev=1.12&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/gnuradio/metadata.xml?r1=1.11&r2=1.12 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/metadata.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- metadata.xml 24 Aug 2014 21:49:25 -0000 1.11 +++ metadata.xml 21 Feb 2015 22:14:24 -0000 1.12 @@ -6,7 +6,6 @@ <flag name='analog'>enable analog signal processing blocks</flag> <flag name='atsc'>enable ATSC (HDTV) transmitter and receiver blocks</flag> <flag name='audio'>enable blocks to connect to audio sources (mic-in) and sinks (speaker-out) ports on a computer</flag> - <flag name='ctrlport'>enable ControlPort rpc</flag> <flag name='channels'>enable channel mode blocks</flag> <flag name='digital'>enable digital signal processing blocks</flag> <flag name='dtv'>enable digital tv signal processing blocks</flag> 1.65 net-wireless/gnuradio/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/gnuradio/ChangeLog?rev=1.65&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/gnuradio/ChangeLog?rev=1.65&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/gnuradio/ChangeLog?r1=1.64&r2=1.65 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- ChangeLog 21 Feb 2015 04:18:42 -0000 1.64 +++ ChangeLog 21 Feb 2015 22:14:24 -0000 1.65 @@ -1,6 +1,13 @@ # ChangeLog for net-wireless/gnuradio # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.64 2015/02/21 04:18:42 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.65 2015/02/21 22:14:24 zerochaos Exp $ + +*gnuradio-3.7.6.1-r2 (21 Feb 2015) + + 21 Feb 2015; Rick Farina <[email protected]> +gnuradio-3.7.6.1-r2.ebuild, + -gnuradio-3.7.6.1-r1.ebuild, gnuradio-9999.ebuild, metadata.xml: + remove ctrlport use flag as upstream has, bug #529498. additional minor dep + cleanup per depcheck *gnuradio-3.7.6.1-r1 (21 Feb 2015) 1.1 net-wireless/gnuradio/gnuradio-3.7.6.1-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/gnuradio/gnuradio-3.7.6.1-r2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/gnuradio/gnuradio-3.7.6.1-r2.ebuild?rev=1.1&content-type=text/plain Index: gnuradio-3.7.6.1-r2.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.7.6.1-r2.ebuild,v 1.1 2015/02/21 22:14:24 zerochaos Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) CMAKE_BUILD_TYPE="None" inherit cmake-utils fdo-mime gnome2-utils python-single-r1 DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios" HOMEPAGE="http://gnuradio.org/"; LICENSE="GPL-3" SLOT="0/${PV}" if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"; inherit git-r3 KEYWORDS="" else SRC_URI="http://s3-dist.gnuradio.org/${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 +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq" REQUIRED_USE="${PYTHON_REQUIRED_USE} audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) oss? ( audio ) jack? ( audio ) portaudio? ( audio ) analog? ( filter ) digital? ( filter analog ) pager? ( filter analog ) qt4? ( filter ) 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}] >=dev-util/cppunit-1.9.14 sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib[${PYTHON_USEDEP}] ) 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 ) qt4? ( >=dev-python/PyQt4-4.4[X,opengl,${PYTHON_USEDEP}] >=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}] >=dev-qt/qtcore-4.4:4 >=dev-qt/qtgui-4.4:4 x11-libs/qwt:6 ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${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:2.8[${PYTHON_USEDEP}] ) zeromq? ( >=net-libs/zeromq-2.1.11 ) " DEPEND="${RDEPEND} dev-lang/swig 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 ) zeromq? ( net-libs/cppzmq ) " src_prepare() { gnome2_environment_reset #534582 # Useless UI element would require qt3support, bug #365019 sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die #epatch "${FILESDIR}"/${PN}-3.6.1-automagic-audio.patch #epatch "${FILESDIR}/${P}-build-type-nonfatal.patch" epatch "${FILESDIR}/${P}-qwt-with-qt5-support.patch" } src_configure() { # TODO: docs are installed to /usr/share/doc/${PN} not /usr/share/doc/${PF} # SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX #audio provider is still automagic #zeromq missing deps isn't fatal 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 $(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \ $(cmake-utils_use_enable analog GR_ANALOG) \ $(cmake-utils_use_enable atsc GR_ATSC) \ $(cmake-utils_use_enable channels GR_CHANNELS) \ $(cmake-utils_use_enable digital GR_DIGITAL) \ $(cmake-utils_use_enable doc DOXYGEN) \ $(cmake-utils_use_enable doc SPHINX) \ $(cmake-utils_use_enable dtv GR_DTV) \ $(cmake-utils_use_enable fcd GR_FCD) \ $(cmake-utils_use_enable fec GR_FEC) \ $(cmake-utils_use_enable filter GR_FILTER) \ $(cmake-utils_use_enable grc GRC) \ $(cmake-utils_use_enable jack GR_AUDIO_JACK) \ $(cmake-utils_use_enable log GR_LOG) \ $(cmake-utils_use_enable noaa GR_NOAA) \ $(cmake-utils_use_enable oss GR_AUDIO_OSS) \ $(cmake-utils_use_enable pager GR_PAGER) \ $(cmake-utils_use_enable performance-counters ENABLE_PERFORMANCE_COUNTERS) \ $(cmake-utils_use_enable portaudio GR_AUDIO_PORTAUDIO) \ $(cmake-utils_use_enable test TESTING) \ $(cmake-utils_use_enable trellis GR_TRELLIS) \ $(cmake-utils_use_enable uhd GR_UHD) \ $(cmake-utils_use_enable utils GR_UTILS) \ $(cmake-utils_use_enable vocoder GR_VOCODER) \ $(cmake-utils_use_enable wavelet GR_WAVELET) \ $(cmake-utils_use_enable wxwidgets GR_WXGUI) \ $(cmake-utils_use_enable qt4 GR_QTGUI) \ $(cmake-utils_use_enable sdl GR_VIDEO_SDL) \ $(cmake-utils_use_enable zeromq GR_ZEROMQ) \ -DENABLE_GR_CORE=ON \ -DSYSCONFDIR="${EPREFIX}"/etc \ -DPYTHON_EXECUTABLE="${PYTHON}" ) 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 else # It seems that the examples are always installed rm -rf "${ED}"/usr/share/${PN}/examples || 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/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 fdo-mime_desktop_database_update fdo-mime_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 fdo-mime_desktop_database_update fdo-mime_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 }
