diff options
author | Rick Farina <zerochaos@gentoo.org> | 2014-03-03 04:35:27 +0000 |
---|---|---|
committer | Rick Farina <zerochaos@gentoo.org> | 2014-03-03 04:35:27 +0000 |
commit | 2d8aa7409280387f15f4f2f072d69b57fa7c5045 (patch) | |
tree | 93b56e02a3130bd8ef6988a4fcc6c56f9dc47166 /net-wireless | |
parent | Version bump. (diff) | |
download | gentoo-2-2d8aa7409280387f15f4f2f072d69b57fa7c5045.tar.gz gentoo-2-2d8aa7409280387f15f4f2f072d69b57fa7c5045.tar.bz2 gentoo-2-2d8aa7409280387f15f4f2f072d69b57fa7c5045.zip |
merge all versions together, remove base.eclass inherit and migrate, migrate from python to python-single-r1
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)
Diffstat (limited to 'net-wireless')
-rw-r--r-- | net-wireless/gnuradio/ChangeLog | 10 | ||||
-rw-r--r-- | net-wireless/gnuradio/gnuradio-3.6.5.1-r1.ebuild | 193 | ||||
-rw-r--r-- | net-wireless/gnuradio/gnuradio-3.7.2.1-r1.ebuild | 194 | ||||
-rw-r--r-- | net-wireless/gnuradio/gnuradio-9999.ebuild | 64 |
4 files changed, 429 insertions, 32 deletions
diff --git a/net-wireless/gnuradio/ChangeLog b/net-wireless/gnuradio/ChangeLog index 64a5e7af343c..0765e9c67518 100644 --- a/net-wireless/gnuradio/ChangeLog +++ b/net-wireless/gnuradio/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-wireless/gnuradio # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.37 2014/03/02 18:56:35 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.38 2014/03/03 04:35:27 zerochaos Exp $ + +*gnuradio-3.7.2.1-r1 (03 Mar 2014) +*gnuradio-3.6.5.1-r1 (03 Mar 2014) + + 03 Mar 2014; Rick Farina <zerochaos@gentoo.org> +gnuradio-3.6.5.1-r1.ebuild, + +gnuradio-3.7.2.1-r1.ebuild, gnuradio-9999.ebuild: + merge all versions together, remove base.eclass inherit and migrate, migrate + from python to python-single-r1 02 Mar 2014; Rick Farina <zerochaos@gentoo.org> -gnuradio-3.7.1.1.ebuild, -gnuradio-3.7.2.ebuild: diff --git a/net-wireless/gnuradio/gnuradio-3.6.5.1-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.6.5.1-r1.ebuild new file mode 100644 index 000000000000..e3cd04fe391f --- /dev/null +++ b/net-wireless/gnuradio/gnuradio-3.6.5.1-r1.ebuild @@ -0,0 +1,193 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.6.5.1-r1.ebuild,v 1.1 2014/03/03 04:35:27 zerochaos Exp $ + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) + +inherit cmake-utils fdo-mime 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-2 + KEYWORDS="" +else + SRC_URI="http://gnuradio.org/releases/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~x86" +fi + +IUSE="alsa +analog +digital doc examples fcd +filter grc jack oss performance-counters pager portaudio qt4 sdl uhd +utils wavelet wxwidgets" + +REQUIRED_USE="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.7 ) +# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669 +RDEPEND=">=dev-lang/orc-0.4.12 + dev-libs/boost:0= + !<=dev-libs/boost-1.52.0-r6:0/1.52 + dev-python/cheetah + dev-util/cppunit + sci-libs/fftw:3.0= + fcd? ( virtual/libusb:1 ) + alsa? ( + media-libs/alsa-lib + ) + grc? ( + dev-python/lxml + dev-python/numpy + dev-python/pygtk:2 + ) + jack? ( + media-sound/jack-audio-connection-kit + ) + portaudio? ( + >=media-libs/portaudio-19_pre + ) + qt4? ( + dev-python/PyQt4[X,opengl] + dev-python/pyqwt:5 + dev-qt/qtgui:4 + ) + sdl? ( media-libs/libsdl ) + uhd? ( >=net-wireless/uhd-3.4.3-r1:= ) + wavelet? ( + sci-libs/gsl + ) + wxwidgets? ( + dev-python/wxpython:2.8 + dev-python/numpy + ) +" +DEPEND="${RDEPEND} + dev-lang/swig + virtual/pkgconfig + doc? ( + >=app-doc/doxygen-1.5.7.1 + dev-python/sphinx + ) + grc? ( + x11-misc/xdg-utils + ) + oss? ( + virtual/os-headers + ) +" + +src_prepare() { + # 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 +} + +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 + mycmakeargs=( + $(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \ + $(cmake-utils_use_enable analog GR_ANALOG) \ + $(cmake-utils_use_enable digital GR_DIGITAL) \ + $(cmake-utils_use_enable doc DOXYGEN) \ + $(cmake-utils_use_enable doc SPHINX) \ + $(cmake-utils_use_enable fcd GR_FCD) \ + $(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 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 uhd GR_UHD) \ + $(cmake-utils_use_enable utils GR_UTILS) \ + $(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) \ + -DENABLE_GR_CORE=ON + -DSYSCONFDIR="${EPREFIX}"/etc + ) + use qt4 && mycmakeargs+=( -DQWT_INCLUDE_DIRS="${EPREFIX}"/usr/include/qwt5 ) + 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}"usr/share/${PN}/ +} + +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 +} diff --git a/net-wireless/gnuradio/gnuradio-3.7.2.1-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.7.2.1-r1.ebuild new file mode 100644 index 000000000000..f188264098c3 --- /dev/null +++ b/net-wireless/gnuradio/gnuradio-3.7.2.1-r1.ebuild @@ -0,0 +1,194 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.7.2.1-r1.ebuild,v 1.1 2014/03/03 04:35:27 zerochaos Exp $ + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) + +inherit cmake-utils fdo-mime 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-2 + KEYWORDS="" +else + SRC_URI="http://gnuradio.org/releases/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~x86" +fi + +IUSE="alsa +analog +digital doc examples fcd +filter grc jack oss performance-counters pager portaudio qt4 sdl uhd +utils wavelet wxwidgets" + +REQUIRED_USE="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.7 ) +# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669 +# gr-ctrlport needs "ice 3.5" +RDEPEND=">=dev-lang/orc-0.4.12 + dev-libs/boost:0= + !<=dev-libs/boost-1.52.0-r6:0/1.52 + dev-python/cheetah + dev-util/cppunit + sci-libs/fftw:3.0= + fcd? ( virtual/libusb:1 ) + alsa? ( + media-libs/alsa-lib + ) + grc? ( + dev-python/lxml + dev-python/numpy + dev-python/pygtk:2 + ) + jack? ( + media-sound/jack-audio-connection-kit + ) + portaudio? ( + >=media-libs/portaudio-19_pre + ) + qt4? ( + dev-python/PyQt4[X,opengl] + dev-python/pyqwt:5 + dev-qt/qtgui:4 + ) + sdl? ( media-libs/libsdl ) + uhd? ( >=net-wireless/uhd-3.4.3-r1:= ) + wavelet? ( + sci-libs/gsl + ) + wxwidgets? ( + dev-python/wxpython:2.8 + dev-python/numpy + ) +" +DEPEND="${RDEPEND} + dev-lang/swig + virtual/pkgconfig + doc? ( + >=app-doc/doxygen-1.5.7.1 + dev-python/sphinx + ) + grc? ( + x11-misc/xdg-utils + ) + oss? ( + virtual/os-headers + ) +" + +src_prepare() { + # 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 +} + +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 + mycmakeargs=( + $(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \ + $(cmake-utils_use_enable analog GR_ANALOG) \ + $(cmake-utils_use_enable digital GR_DIGITAL) \ + $(cmake-utils_use_enable doc DOXYGEN) \ + $(cmake-utils_use_enable doc SPHINX) \ + $(cmake-utils_use_enable fcd GR_FCD) \ + $(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 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 uhd GR_UHD) \ + $(cmake-utils_use_enable utils GR_UTILS) \ + $(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) \ + -DENABLE_GR_CORE=ON + -DSYSCONFDIR="${EPREFIX}"/etc + ) + use qt4 && mycmakeargs+=( -DQWT_INCLUDE_DIRS="${EPREFIX}"/usr/include/qwt5 ) + 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}"usr/share/${PN}/ +} + +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 +} diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild index f4fe91fcabd6..45265ff73122 100644 --- a/net-wireless/gnuradio/gnuradio-9999.ebuild +++ b/net-wireless/gnuradio/gnuradio-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 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.9 2013/11/18 15:49:30 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild,v 1.10 2014/03/03 04:35:27 zerochaos Exp $ EAPI=5 -PYTHON_DEPEND="2" +PYTHON_COMPAT=( python2_7 ) -inherit base cmake-utils fdo-mime python +inherit cmake-utils fdo-mime python-single-r1 DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios" HOMEPAGE="http://gnuradio.org/" @@ -21,17 +21,27 @@ else KEYWORDS="~amd64 ~arm ~x86" fi -IUSE="alsa doc examples fcd filter grc jack oss performance-counters portaudio qt4 sdl uhd utils wavelet wxwidgets" +IUSE="alsa +analog +digital doc examples fcd +filter grc jack oss performance-counters pager portaudio qt4 sdl uhd +utils wavelet wxwidgets" + +REQUIRED_USE="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.7 ) # boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669 +# gr-ctrlport needs "ice 3.5" RDEPEND=">=dev-lang/orc-0.4.12 dev-libs/boost:0= !<=dev-libs/boost-1.52.0-r6:0/1.52 dev-python/cheetah dev-util/cppunit - sci-libs/fftw:3.0 + sci-libs/fftw:3.0= fcd? ( virtual/libusb:1 ) alsa? ( media-libs/alsa-lib @@ -53,7 +63,7 @@ RDEPEND=">=dev-lang/orc-0.4.12 dev-qt/qtgui:4 ) sdl? ( media-libs/libsdl ) - uhd? ( >=net-wireless/uhd-3.4.3-r1 ) + uhd? ( >=net-wireless/uhd-3.4.3-r1:= ) wavelet? ( sci-libs/gsl ) @@ -77,36 +87,29 @@ DEPEND="${RDEPEND} ) " -PATCHES=( - "${FILESDIR}"/${PN}-3.6.1-automagic-audio.patch -) - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - src_prepare() { - python_convert_shebangs -q -r 2 "${S}" # Useless UI element would require qt3support, bug #365019 sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die - base_src_prepare + epatch "${FILESDIR}"/${PN}-3.6.1-automagic-audio.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 mycmakeargs=( - $(cmake-utils_use_enable alsa GR_AUDIO_ALSA) + $(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \ + $(cmake-utils_use_enable analog GR_ANALOG) \ + $(cmake-utils_use_enable digital GR_DIGITAL) \ $(cmake-utils_use_enable doc DOXYGEN) \ $(cmake-utils_use_enable doc SPHINX) \ $(cmake-utils_use_enable fcd GR_FCD) \ $(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 oss GR_AUDIO_OSS) - $(cmake-utils_use_enable performance-counters ENABLE_PERFORMANCE_COUNTERS) - $(cmake-utils_use_enable portaudio GR_AUDIO_PORTAUDIO) + $(cmake-utils_use_enable jack GR_AUDIO_JACK) \ + $(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 uhd GR_UHD) \ $(cmake-utils_use_enable utils GR_UTILS) \ $(cmake-utils_use_enable wavelet GR_WAVELET) \ @@ -123,12 +126,6 @@ src_configure() { src_install() { cmake-utils_src_install - python_clean_installation_image -q - - # Remove bad shebangs that creep back in during install - sed -i '\|#!/usr/bin/python|d' "${ED}"/usr/bin/* || die - - # Install examples to /usr/share/doc/$PF if use examples ; then dodir /usr/share/doc/${PF}/ mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die @@ -150,12 +147,18 @@ src_install() { domenu "${fd_path}/"*.desktop doicon "${fd_path}/"*.png fi + + python_fix_shebang "${ED}"usr/share/${PN}/ +} + +src_test() +{ + ctest -E qtgui } pkg_postinst() { local GRC_ICON_SIZES="32 48 64 128 256" - python_mod_optimize gnuradio if use grc ; then fdo-mime_desktop_database_update @@ -175,7 +178,6 @@ pkg_postinst() pkg_postrm() { local GRC_ICON_SIZES="32 48 64 128 256" - python_mod_cleanup gnuradio if use grc ; then fdo-mime_desktop_database_update |