diff options
| -rw-r--r-- | net-wireless/gnuradio/ChangeLog | 9 | ||||
| -rw-r--r-- | net-wireless/gnuradio/Manifest | 34 | ||||
| -rw-r--r-- | net-wireless/gnuradio/gnuradio-3.7.2.2.ebuild (renamed from net-wireless/gnuradio/gnuradio-3.7.2.1.ebuild) | 77 | ||||
| -rw-r--r-- | net-wireless/gnuradio/gnuradio-3.7.3.ebuild (renamed from net-wireless/gnuradio/gnuradio-3.6.5.1.ebuild) | 91 |
4 files changed, 106 insertions, 105 deletions
diff --git a/net-wireless/gnuradio/ChangeLog b/net-wireless/gnuradio/ChangeLog index 0bc1cad7a872..085c23edf51d 100644 --- a/net-wireless/gnuradio/ChangeLog +++ b/net-wireless/gnuradio/ChangeLog @@ -1,6 +1,13 @@ # 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.40 2014/03/05 16:18:40 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.41 2014/03/09 14:13:47 zerochaos Exp $ + +*gnuradio-3.7.3 (09 Mar 2014) +*gnuradio-3.7.2.2 (09 Mar 2014) + + 09 Mar 2014; Rick Farina <zerochaos@gentoo.org> +gnuradio-3.7.2.2.ebuild, + +gnuradio-3.7.3.ebuild, -gnuradio-3.6.5.1.ebuild, -gnuradio-3.7.2.1.ebuild: + bump, remove non-python-r1 ebuilds *gnuradio-3.6.5.1-r2 (05 Mar 2014) *gnuradio-3.7.2.1-r2 (05 Mar 2014) diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest index f75ce67a4da5..eca34beb0dd7 100644 --- a/net-wireless/gnuradio/Manifest +++ b/net-wireless/gnuradio/Manifest @@ -4,27 +4,29 @@ Hash: SHA512 AUX gnuradio-3.6.1-automagic-audio.patch 2839 SHA256 3e65981e8e8e9c2fc5e8223bf7e93956d6f802bbd9df15277283e9d44b7c5a2b SHA512 406ecc20f4818f83cbd599c216c60a6d0daf70ed3d227613421d53466307e44f3d32cf5480401273baf74a488c3f73349c145452ca865f1ca9365314c1813768 WHIRLPOOL 363650437161e68f056229315f1d0b52fa409ba9b284196c16e7acf96b68e2e036930db45188f61b5b0bb0e4f51bd3007d8fee622476eb605c72f2ff4b6c24c7 DIST gnuradio-3.6.5.1.tar.gz 3150283 SHA256 0875d2f0a7da0f3bcc1771b528b0f98f79d9ab69aa1ef953651bbbe1f57b4621 SHA512 23a22aed482da11005b17e5197ee3ba24d442b30309522b0858e694b58f46b76cc050143d365623c7dd4241cdf8b9f988e1a4dabe2e1f98d0fd4cca71bbb82e8 WHIRLPOOL 7cf55be5fac7891a737d228d83718bbc43f9069c6275c5ac465ae11088559dca5e7fa31239e281271b529aa8b9ae1a0efe3850a16a40e53c0f1fe57e351ff2a8 DIST gnuradio-3.7.2.1.tar.gz 2925751 SHA256 8c6b7e1fda31e9228bdd62a137af901b28757d7e1b044de2e985b96e53c83c80 SHA512 0a0fc63bc233628384535f3741282fd699db95656e8ef30960976823648ef1584c4b46055ab0294fb25028c0a5a9c10547586ca8e25b0692872128c5243c9a08 WHIRLPOOL e9d51839023c589691240ce36faf1cd470bf3018766f60c76288c9af93d6f95ec70f344098109acf5490af9f69cdc37537688a6f1997f8174803d9e022c0b86d +DIST gnuradio-3.7.2.2.tar.gz 2963986 SHA256 e5aa0790b63bf7f5da35c67116f574ee033f75a3b9af3b32f11e135f9d59c491 SHA512 6884b7b8e655dfe78e2388ecf489e2bc94908e19c5f1bd0648e88f223907bf13350f641c4636e1a9ad13cab89627e24384957342ef3c336d439bb3634e36ada4 WHIRLPOOL 0f24fcbb9b8e5d118658ce75c6c1cedde7f63106371050d5e8665f44df96a7849f313235c068837704629bf3826a72eebcb4daf82a83aa66830bd458a026b955 +DIST gnuradio-3.7.3.tar.gz 2986331 SHA256 1c71d1819a67bac4148c619fc2a7d2c0ea0b0d08aa4660a11d65ab7b713b5231 SHA512 f0eb7f11c8a84cccc6c466ad3e56b49475bf9055681dd23cd4adf92c4d08d28080b97afc034e84f1c6c5086c754bb25556a42ce3879b3ba2352791bf41cbb5bd WHIRLPOOL 803533e7d07a71bdd855ec9bc0b36f85c715f9527d2e94fc35c0ea39ff24e0329fc77fb8aedbd1d728b25337fd6743ce953710d721a551dbd172c093988c20f4 EBUILD gnuradio-3.6.5.1-r2.ebuild 5583 SHA256 5540842f65142861c5144fd494d8e8d47d7ef72746cb753f747afcd31387487f SHA512 91e151bf28e1d21e2d9da822cae7c02d4985498c5c7a4548b913fafed9898e7266e0268ecd7b0ae9f3a5ed15fdff5cc912b67f7475af72f59ad2761b512f0b68 WHIRLPOOL 605e0ea1da8bd38616c6751540ace9c174aedd6d87352dbea7acd26215efa20c6671367d96c5d61f154b7de8cf60079e690a11ca63f99c9dce4a2989f691243f -EBUILD gnuradio-3.6.5.1.ebuild 5234 SHA256 adf83b3fe7d2f84096470cdaccc95e8f16f9c9e3b13e9fa3c590c2de5d97ad32 SHA512 3816b34df44f5d4100948032c26fa025417bb5ec604590fe8da98d8037b8001246e11eaf924524d3bec82e4e0a130f4d00313fdd5cde986cc715bd66af77043c WHIRLPOOL e54a3cf4ebad5e4faba5ab43931937826ee0b6f22b60fb0f931de78efa0ba23f83708594b4a4e78b8abbe5a58375f0b24822943c34f44f0e63b98f62d94d34fe EBUILD gnuradio-3.7.2.1-r2.ebuild 5613 SHA256 13842ba703819c4ec69f8c33ed1fd0a105c2ccbf2220c69aa40ef879a3b147fd SHA512 d5e527c93bcd8b8953f96feb262dce567cc153db3727260ba082a46cfd3a38fd0c4176b0cf1481feac07ac4e1668868ff0a4a7139aeba0f4cf6871a71cdde1da WHIRLPOOL c8a63da32f3d5e516c4375eb4dc55d6dbb063a4f875434612d56342f82af32a9d3addfdb19dfb94fd91bed9290cc02850bd66369c81f8cfe01ca934bbff71b9e -EBUILD gnuradio-3.7.2.1.ebuild 5675 SHA256 fcfa0237a20157d4d953cdd38194c585971fdc14d563320d0c20a12d81a00043 SHA512 33b81b72d6b8517aa71df25cb967fd04f9ef818a012f5c51d2aaaa83af8d6b9292b172c0c7c41a7e416f5310c98b0daad08009eef19ac99cb60e81782514d772 WHIRLPOOL 91ef295c0d40fcd0569ca0716aee8b4de40f5815e9c74f27527352bcddbf737ffbeeea3fa43a8e899f620f06feb03f3dadb6324f518279a7aa8d3a1a67b7d37e +EBUILD gnuradio-3.7.2.2.ebuild 5610 SHA256 6e669af4f62de013e3ff7c78f731c337e1b3ba5c098eb2455e0486fb29c5f42a SHA512 fcbdab6305f530cc822ddfbdc68d25c9e0620f504ab39c784a4b9df7db73a324ca78795a5056c52af31eb61ae04a77092c2db4caddfd84b43c28a82e3468294b WHIRLPOOL 4927e91a3a970cc32bb444ec295a9229602570e779cf5a9ce17a92eca042de5d3ee12f2d8affd7e1bb4162c2618c8f52845e333139cac2b6ba1b56e076226f6e +EBUILD gnuradio-3.7.3.ebuild 5608 SHA256 d94425d21bd8675188de494ab3ecc96dfaea5807a93792953b3349e346e1dee5 SHA512 735c39f913f4517d829beac05a0f95a60679fb094d52d9a4f85a186dd6217f145d504b2b065f21a34932e058e1d357b0e345bb9d38bfeb346e351efcafebc6ba WHIRLPOOL c71112815e96ac6d5b1511dfb01929c5f54539133d9940c9c44294f2ecab70ca2979a790f0226e03a945b59e5aeabc36298fc7c7ab7075f086a9498e6416a621 EBUILD gnuradio-9999.ebuild 5608 SHA256 7406c5a3b612bc0f142efa93eddaba0e42d856230f0cf3dea472f87fb7c1d26b SHA512 dcd0657501fc31a72bac4d9ec127a8e8476df533d81b621af91f63cd5a47eadbca70140134d53d811dd88b6f0f4e990fd2173ba9f1d3328d9a61e9594be79ac0 WHIRLPOOL c9aa58e1eb0895a85f342a7500db1288a4e1bde86ec5f233b66ac48b184a2952655ffa1b5559921e864b05a9b03bbcbb66de2655d5816e8f91c01884b30a6e5d -MISC ChangeLog 7702 SHA256 77af84dce1de6420017ace2415c247456a53ffcaf7e07221de57131cb392f444 SHA512 5646e3d7be4c7300c00bea526a25aa46091971ff80fdb60fab5e1e6cf675330ce6015437eaf59ed9b450f12fbd1cf7bc717014c7647f062147de2886a6d69530 WHIRLPOOL 3f4c32c3584f16f889af6576bfe730ad851ecdbfe07d6b2036a92fe2d55d44646bd4d761888f771d0b0a33127ccb38d8f95123693268eb2a876e831dbaa5f024 +MISC ChangeLog 7957 SHA256 e9cd290447bc1da01950cdde30b4eb7bf2cae4f4fdbf955150a87fb2393ad5b6 SHA512 87417c3f91cbdb85771da9916b9375862881bc5c560a963c51c4681fd9f86292500e507fa79d03331d945c4937126380a1f0339653a811545de08c78ddf0b829 WHIRLPOOL 52b789793f42e6cb80092fc9346e85c51dc7f81bef8dc3e1f3a7198940355752676587bd7a929fca6febb9261a9c853aeb7c553bc3cce1dd1aa32e1c7321ac13 MISC metadata.xml 932 SHA256 95bbb6d405dcad3e6493fd0ac72f6d6265ed76d2d7b3c71fcc50526571cc765d SHA512 33cf8b1561849cc735d43f6567f00af613e44e777cdd4235d01784d7eb7bae07040b1a7eff237a90b0b69e906e099f9dbabc2545b3b35c738653ca9c73cde7cc WHIRLPOOL 0dbb103c57e7ec0d8cbfd77b69193dbdf8d9762249a0df4304ee0e9b178c1b6000605525512429f09196bfc3b009f35f77eb1cad9043a65d8927ba7dfb5f678e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCgAGBQJTF07jAAoJEKXdFCfdEflKEPMP/RoC12asrXda3V/AH0iqEtdR -r/3FRQNzJP1FlWS9OIST4kbCxi1vBUoibjBGmAnHzZDPNrLCGzm19/CBD2n9aSKd -rLcE7E6mlf1QpjZXeWfYaFYD8KRx9q+HsrZla/4iI8S27p8RCjMXTb/QBP5DWVqR -cbD9lhHTP1t3nACOaptcutpOlVzbcHyL+P2OrGLnfG6H1kesSZKP1tQoXw+SEv5y -HNFB6QdP0gEKoytBg4QTRIdjrv2sqC3IKt+OADTkaVhGYResSqaEkKzxy9f03on/ -uT2AbyHQSfmnBbxTq3P57HYC/xjsDbAIbzfbBjx77fayhKZYWy9AZP0cM4++NWRt -APdjaz/mFst38gE2xb0PH+QnE89TPkS+Y4Tg+ENx7+iLNXAiredFIwB6veO8GWAo -Fy0UAqNj3dgMqRBDTUvX0OY7qvxvxC2uENf7ZisS7fBbSnBFTZPC63MMe0RavNV5 -vKrAP/Dt39JmrP3UZlJ3GPr1EfLc05EaMOtFFW/PvmLhE2/By5pD4UCU1dkR3Gth -1oRmGHaac69dzQkYlNUD6OwpGt46lnFd4uBgokOVwXFPJcC4buYaJlm4b5sv9c+y -XR6BiBDf3XGpl/I/KvedVdZAYQz4cIR+CMhEvf3Z4AZDgAtfwBoQs7ss7Z/gy0yZ -gq01AmUhKGxL2BEMzAA8 -=NmKi +iQIcBAEBCgAGBQJTHHexAAoJEKXdFCfdEflKAcgQAIDJ8JRW2tNtMPvx1Yxaew3S +WreEb+hdpp4mWPeNRAsiVmNSMQTxlF9iTjVoZDkiLpaMEac7AisUlI08lSwVwc63 +OTSOiBRc7Rdl4Hd+YgFQTowjY+kAI0oZll49REVVLXHJay8UjkXmhYrjRZilTQ3a +Eb7KR8nYmY9z3ybvI6A0myjaMXUFV5qspB0v/lZc4XbI4OAO0ICWVEYgxTi4V2Zu +KecM/5BAtYQK82qiV4jQF+IlCajpLPcuH9l4EzABjPkdNnvuHl6UXxa4KlF0Tlo1 +tgNgdWVcVTGo0VorW2pvolxTKt+1G7Nwv72R+ZgdLbSQzlLssIFgyxPW9mxforR1 +acQwfjevPKCyQgN2ZZ4pPicQzt+AIKq03sGukzOWBWOcgdVnSM7zyt3DeG+1EB4o +BlaRk814FJw6NRYYgNas/9XddOs6Vlbd4VdgoCtNuCIG90jBV7lSJFz8MRWxzlMH +HIcSSxgL1hXjW4iOO/ZHRV2SNXBf6TNeevdCgGgmR9hFAfQG2KkNAQ5XZjvE7huS ++0PDKY2aTF9bE3J1d7CZCye9DEpVnCZVlMIG7LveMRPnhFkpPV4cTemMl7Gr77kF +7mpBDKeQJy8FL8DYdD8sM5kChg4xnNx5brXsVz6KX6BuV/JZi9pjSEYaOGDGtdDB +I9L861ELOqP1IQoqHr+X +=UE1s -----END PGP SIGNATURE----- diff --git a/net-wireless/gnuradio/gnuradio-3.7.2.1.ebuild b/net-wireless/gnuradio/gnuradio-3.7.2.2.ebuild index 773debf6c52a..7907a0cf2185 100644 --- a/net-wireless/gnuradio/gnuradio-3.7.2.1.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.7.2.2.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-3.7.2.1.ebuild,v 1.1 2013/11/30 04:41:09 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.7.2.2.ebuild,v 1.1 2014/03/09 14:13:47 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,9 +21,10 @@ else 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" +IUSE="alsa +analog +digital doc examples fcd +filter grc jack oss pager performance-counters portaudio qt4 sdl uhd +utils wavelet wxwidgets" -REQUIRED_USE="analog? ( filter ) +REQUIRED_USE="${PYTHON_REQUIRED_USE} + analog? ( filter ) digital? ( filter analog ) pager? ( filter analog ) qt4? ( filter ) @@ -36,20 +37,21 @@ REQUIRED_USE="analog? ( filter ) # 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= +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/cheetah dev-util/cppunit sci-libs/fftw:3.0= fcd? ( virtual/libusb:1 ) alsa? ( - media-libs/alsa-lib + media-libs/alsa-lib[${PYTHON_USEDEP}] ) grc? ( - dev-python/lxml - dev-python/numpy - dev-python/pygtk:2 + dev-python/lxml[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pygtk:2[${PYTHON_USEDEP}] ) jack? ( media-sound/jack-audio-connection-kit @@ -58,18 +60,18 @@ RDEPEND=">=dev-lang/orc-0.4.12 >=media-libs/portaudio-19_pre ) qt4? ( - dev-python/PyQt4[X,opengl] + dev-python/PyQt4[X,opengl,${PYTHON_USEDEP}] dev-python/pyqwt:5 dev-qt/qtgui:4 ) sdl? ( media-libs/libsdl ) - uhd? ( >=net-wireless/uhd-3.4.3-r1:= ) + uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] ) wavelet? ( sci-libs/gsl ) wxwidgets? ( - dev-python/wxpython:2.8 - dev-python/numpy + dev-python/wxpython:2.8[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] ) " DEPEND="${RDEPEND} @@ -77,7 +79,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 - dev-python/sphinx + dev-python/sphinx[${PYTHON_USEDEP}] ) grc? ( x11-misc/xdg-utils @@ -87,47 +89,38 @@ 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 analog GR_ANALOG) + $(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 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 + -DENABLE_GR_CORE=ON \ + -DSYSCONFDIR="${EPREFIX}"/etc \ + -DPYTHON_EXECUTABLE="${PYTHON}" ) use qt4 && mycmakeargs+=( -DQWT_INCLUDE_DIRS="${EPREFIX}"/usr/include/qwt5 ) cmake-utils_src_configure @@ -136,12 +129,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 @@ -163,6 +150,8 @@ src_install() { domenu "${fd_path}/"*.desktop doicon "${fd_path}/"*.png fi + + python_fix_shebang "${ED}" } src_test() @@ -173,7 +162,6 @@ src_test() pkg_postinst() { local GRC_ICON_SIZES="32 48 64 128 256" - python_mod_optimize gnuradio if use grc ; then fdo-mime_desktop_database_update @@ -193,7 +181,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 diff --git a/net-wireless/gnuradio/gnuradio-3.6.5.1.ebuild b/net-wireless/gnuradio/gnuradio-3.7.3.ebuild index e9a177610829..a093e00788dd 100644 --- a/net-wireless/gnuradio/gnuradio-3.6.5.1.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.7.3.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-3.6.5.1.ebuild,v 1.3 2013/11/18 15:49:30 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.7.3.ebuild,v 1.1 2014/03/09 14:13:47 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,25 +21,37 @@ 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 pager performance-counters portaudio qt4 sdl uhd +utils wavelet wxwidgets" + +REQUIRED_USE="${PYTHON_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= +# gr-ctrlport needs "ice 3.5" +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/cheetah dev-util/cppunit - sci-libs/fftw:3.0 + sci-libs/fftw:3.0= fcd? ( virtual/libusb:1 ) alsa? ( - media-libs/alsa-lib + media-libs/alsa-lib[${PYTHON_USEDEP}] ) grc? ( - dev-python/lxml - dev-python/numpy - dev-python/pygtk:2 + dev-python/lxml[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pygtk:2[${PYTHON_USEDEP}] ) jack? ( media-sound/jack-audio-connection-kit @@ -48,18 +60,18 @@ RDEPEND=">=dev-lang/orc-0.4.12 >=media-libs/portaudio-19_pre ) qt4? ( - dev-python/PyQt4[X,opengl] + dev-python/PyQt4[X,opengl,${PYTHON_USEDEP}] dev-python/pyqwt:5 dev-qt/qtgui:4 ) sdl? ( media-libs/libsdl ) - uhd? ( >=net-wireless/uhd-3.4.3-r1 ) + uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] ) wavelet? ( sci-libs/gsl ) wxwidgets? ( - dev-python/wxpython:2.8 - dev-python/numpy + dev-python/wxpython:2.8[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] ) " DEPEND="${RDEPEND} @@ -67,7 +79,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 - dev-python/sphinx + dev-python/sphinx[${PYTHON_USEDEP}] ) grc? ( x11-misc/xdg-utils @@ -77,44 +89,38 @@ 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) \ $(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 + -DENABLE_GR_CORE=ON \ + -DSYSCONFDIR="${EPREFIX}"/etc \ + -DPYTHON_EXECUTABLE="${PYTHON}" ) use qt4 && mycmakeargs+=( -DQWT_INCLUDE_DIRS="${EPREFIX}"/usr/include/qwt5 ) cmake-utils_src_configure @@ -123,12 +129,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 +150,18 @@ src_install() { 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" - python_mod_optimize gnuradio if use grc ; then fdo-mime_desktop_database_update @@ -175,7 +181,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 |