summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Farina <zerochaos@gentoo.org>2013-03-18 21:48:43 +0000
committerRichard Farina <zerochaos@gentoo.org>2013-03-18 21:48:43 +0000
commitf67ed40de9dc48a8e3705aa3834c8f4ffb86e075 (patch)
tree7cefe31914d9f864d7bcd289b271afacb3e2a1ea /net-wireless/gnuradio
parentVersion bump (diff)
downloadhistorical-f67ed40de9dc48a8e3705aa3834c8f4ffb86e075.tar.gz
historical-f67ed40de9dc48a8e3705aa3834c8f4ffb86e075.tar.bz2
historical-f67ed40de9dc48a8e3705aa3834c8f4ffb86e075.zip
bugfix release, remove old ebuild
Package-Manager: portage-2.1.11.52/cvs/Linux x86_64 Manifest-Sign-Key: 0xDD11F94A
Diffstat (limited to 'net-wireless/gnuradio')
-rw-r--r--net-wireless/gnuradio/ChangeLog8
-rw-r--r--net-wireless/gnuradio/Manifest28
-rw-r--r--net-wireless/gnuradio/gnuradio-3.6.4.1.ebuild (renamed from net-wireless/gnuradio/gnuradio-3.5.3.2.ebuild)143
-rw-r--r--net-wireless/gnuradio/metadata.xml2
4 files changed, 107 insertions, 74 deletions
diff --git a/net-wireless/gnuradio/ChangeLog b/net-wireless/gnuradio/ChangeLog
index 04cbfc95d431..29e5ec2144c9 100644
--- a/net-wireless/gnuradio/ChangeLog
+++ b/net-wireless/gnuradio/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-wireless/gnuradio
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.23 2013/03/12 19:50:12 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.24 2013/03/18 21:48:33 zerochaos Exp $
+
+*gnuradio-3.6.4.1 (18 Mar 2013)
+
+ 18 Mar 2013; Rick Farina <zerochaos@gentoo.org> +gnuradio-3.6.4.1.ebuild,
+ -gnuradio-3.5.3.2.ebuild, metadata.xml:
+ bugfix release, remove old ebuild
*gnuradio-3.6.4 (12 Mar 2013)
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index b12d13d1432d..7d67bb10b7a6 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,13 +1,33 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
AUX gnuradio-3.6.1-automagic-audio.patch 2839 SHA256 3e65981e8e8e9c2fc5e8223bf7e93956d6f802bbd9df15277283e9d44b7c5a2b SHA512 406ecc20f4818f83cbd599c216c60a6d0daf70ed3d227613421d53466307e44f3d32cf5480401273baf74a488c3f73349c145452ca865f1ca9365314c1813768 WHIRLPOOL 363650437161e68f056229315f1d0b52fa409ba9b284196c16e7acf96b68e2e036930db45188f61b5b0bb0e4f51bd3007d8fee622476eb605c72f2ff4b6c24c7
-DIST gnuradio-3.5.3.2.tar.gz 4315336 SHA256 e559a07de634de350fcf370daca2c2931231da25370001129de34a2865843f24
DIST gnuradio-3.6.2.tar.gz 2604075 SHA256 4ce84bf9c6591b5ddc2c384e03e40fc2f0cb8cd1add485ee2d6f26052cc6de35 SHA512 7c0dd55db478500a1e79592a4f1e1a7b938672d46f9298c8ff4edd67a919f19f0c6107d4419a3698a1fc95759871b03e441a778fcf718dd518171b01f2d35589 WHIRLPOOL 26eccc1eaadc8361be8bb79dc8768abe5f02001e07909f693eeffb1494eaad6d3355e2f780f1480737f8315aed83423beb83ab2d0e967173d1398255aab58d50
DIST gnuradio-3.6.3.tar.gz 2766447 SHA256 bf4b2d7df2c078a6fccc0cf288d12bbb7617a9f86d453028db95f05e47745c9f SHA512 b58aefba7dc04c4a4e055f6bf74a026ef6e4bf7422fdc139e2c20fbf837b60ad419090aa0eca92c79fb25228dd160a04779c4aa9fed5ff65294fad4c61fb1683 WHIRLPOOL d1e7918dd57d642a2fa2539865f0f5d8c50e9f216a7919c87ce9ff4434a216a5e90ec835ec266ab2e7e43fe8b400e998f790ca15babf64049f5262a1b992c285
+DIST gnuradio-3.6.4.1.tar.gz 2920635 SHA256 0179460485516a88be7d3edb812fdb2370787917d01f71cf3be5f8af561c7f72 SHA512 a8b7fa7c518599f0319e0bdac1b818b26a323f39a977b9207f9251634879e4b9b7a52c6b6a8e3f45ff2e1a0a869de5dddd418367bd781791db7b943bcc4915e0 WHIRLPOOL 5353a3892d9ac69e10991723a35be185f2b4d3f6ff0fc082db13a31353a8ff4bf8076fc45bf5f39c3ed192b6ae69c994f8948f45f1477875df882086b25adf3f
DIST gnuradio-3.6.4.tar.gz 2922269 SHA256 a0e2bcfb55457cb302c440f981ff4876a7b18dc24210e90db4ae500a28e94369 SHA512 0072fd4b9176626085617a504a5749b9f278439d9cad6ee739f4a902e7b4acf1ad606d1c53343d7adba63189f1cae7eaf4eea8d24073b3f20e5dfa6211585a38 WHIRLPOOL c42b2ebe0fa33018d8206edc65368e140d2ddb942717ce189bbd2524eb0b1bf30c0f6656bd1775d1cb18eac094837d1dc52d3e67b04cf1de84f746814b10a0a5
-EBUILD gnuradio-3.5.3.2.ebuild 5130 SHA256 c607a3cf638ba6065192b28c311b697a96106209b5a2c184bbbdc9d43a48ff7b SHA512 21f1cbb943d4ed0ea6c07f1ebb88e0ead01ab433e00768d31d6f3ccb0f66c4fa7cb19ad47baccc7c2acdce2f99883ddfb2cffbba7b832acd6dbce636a48ac45d WHIRLPOOL 248c0e0a73d48834b772b4b14c88ae37b67b3dd2bca8d4d1cf736d911c399578c9dcc1bc52eca4e4276ae49db5ebbdfecb60c19ea5d654447b2ea979fd2448b4
EBUILD gnuradio-3.6.2-r1.ebuild 4863 SHA256 be9ec8d903ef1bd411d699c36c206abd08f3f1c09d1b37f8aa1bf35c8f8e5f66 SHA512 0e460cdde4e61f0359a8da21729881dd812d72384310f61a66bc489788d7574e6e2dfae1acd7a6bc653fc2c3708e7db842e6132ce5cf5f20d1150535b1a2838f WHIRLPOOL b4bf5f5dd5b07b7349ca5307da06193fc6f609c68a27f398f7b6ad9e277857754b6f19f71b0759b1c3d0095bc9b9b2789860dad2600c1102205a393b4dcb11fe
EBUILD gnuradio-3.6.2.ebuild 4801 SHA256 276b88a02d9515f1785d8f12dcc01b749b1094c576709c718b845c7746558cc4 SHA512 e55195ae3249a87afe20c6c0730126b5f4ee0d0cd22c0046a015fe6e35579b2c8a2f9d484b5a8b3a5c73a6c91c7778dddad20a085f4b304f135c8114891214f1 WHIRLPOOL b541ba3255c11798a6abb8bfbd0a582fee71119af088875ba65beeabc76255656a7d2d48e269304dc44a50169b9a7c9579e3cba86a7ca8377be7171218882086
EBUILD gnuradio-3.6.3.ebuild 4985 SHA256 f1f1a30e328e5f7acc821fcebe794f977d54f232c5581c47d6fc8007818f8a6b SHA512 7a2a605ef99cb4b392bd8dcdfe63c0b76536087d77c40cafeeb90d6a58fd29f8117c985ee32e1fdfa5d8d20364bd78bcbcf5c725323b128c30058b8f659cba5c WHIRLPOOL edec98b169aaf0bfcd18923302c8fd230d476615424afdae9a7026266d8a757af57db49b6fae5d7e10e79c9624a8873dcc40207b3c3e623d8d40f48569783c67
+EBUILD gnuradio-3.6.4.1.ebuild 5193 SHA256 1c90e28481d0fb94d5049b3f907fe798d8502f9d52ed48fcd351d9509fe219fc SHA512 b47141156ccee0f49b01c2f97335e30951df77dbe711f1368c4b5b87f2ca4182ae8fd2a806f439ae500af13d98a3912099cb2e83bca69a7bbf54e6e4a1dce42e WHIRLPOOL 4826be5fc9c4739a20aff5ce73cfa6a08c7e247f4f284ab65c43b8b4daac131efafc0be3060cfe818148e1028aa961c2807b15099d00a7f94e039a7f797b3777
EBUILD gnuradio-3.6.4.ebuild 5190 SHA256 6b14d813e95413e7cafc8e2f43bb8c0f7e1f2f4747f256dcbe6843551c530fb4 SHA512 e7c2f328dd76cca670dae808992506400ce4a7209ea9d9a000b11f4b68c9302cee259f9990224c71f407f9e04236a84b349f4e23fb2416ed3ef62d27cc528ab1 WHIRLPOOL a4373577a8fdb1553ec95768ee78a4524aeabd42866e1438e39fd61156104eacbda6ce6be8b5667a9c2f1e9acfc99d39fe73a98ca82e000e7fe09610c895f986
EBUILD gnuradio-9999.ebuild 5189 SHA256 0c760831e73ae11079aa935a8f213780602225b9e59b95d9d5ff8805f6f29ecc SHA512 47f6acf2603020ad3a2ef2217c50cf6f7269962c5ace95053bebbf201cabb6810d81faf723f6ab5eefe3585022acf5c1daae63c41b550632c1627340e644e316 WHIRLPOOL 74d83c31fa73188037dc975440841cfebcc26a546d3ed0d15e80436e527466f549996f9043d98c7669556674ecb147cd18dcb0ba242417bdb948b6e172c08a6b
-MISC ChangeLog 4357 SHA256 255dd913b5d30fa1089b717fe8c53412c83afd3562abeb561a4603b10aaad0da SHA512 fa2eaebe25053c2c26d5119ae245f9959fa280460419cb2984326e5df52e5fa04ac040ebafd2da643325eb3f5458955b7658de06019043e77ad22238f6957620 WHIRLPOOL 4963aa181f94b8af30301efdfc976b54e80270a55ca80ea1cbc7d67768900f49c166b42f6d6b1292c40494a0a83430f4b6af88359e46b8ed3b3ae3cbd201665e
-MISC metadata.xml 837 SHA256 c8ce38e655e8ee8a51bb7e8c4498b46427b4ab45d6048aaec940f3b3446f43c0 SHA512 58b8d6fad4d2f778916a17cbcc3dbf7d8402ac378ce686c4e41eea9b972e141e8f6be7e3c47530b790b98aa92fabecb9e53496b0cf389caf2ac6ad4eabab36ad WHIRLPOOL e67471d5e7017dc1b845fab05ba8d23b4afd2baee06fbf3f0153e002678a1c2851bbef52e8eeac9a9e01c79252abcb03748bca4f51579763857b6c8a0a476a62
+MISC ChangeLog 4546 SHA256 93c4214ae3ff65fced7f643de98fc7e73216452dce8f1bc88cb340b41b7734c2 SHA512 c5d8bfb724bb0848e1749e2687abfbd3ee4ef2b60e9fce54eed428b3ab6248a2885d71d5c522d9982dc09ed4aeacc66fbf528ec5b7fbdf902204a4de3d96399f WHIRLPOOL b334747443074720011b3b605baa71909238e34c40a6ccff3ac894b99b238255d761f96b8238e4096f0f227e70a7b6c66fab1117396a7f66834a263824918c06
+MISC metadata.xml 728 SHA256 9e95ec272bf243e9aeeb83495eb985756816acbf667fc0af1628bb2e53aa71c1 SHA512 5e43037b0b2e8b249abf465d22006330cfa04c12366a13ddd24f25393d910d6c62cab12a88942c55521e4dceaa2d3dd42e32c35a0d57f75f19922a001e9262e3 WHIRLPOOL d89b6e7e79bc63184c80346281d76567483596407d146dea1f7f9740c997cdf756ad603287e65ccb9e699a7b6ad57e268086acc76d8131936605e09d71347caf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCgAGBQJRR4wPAAoJEKXdFCfdEflKARMQAIim7qXA/PeB/LOdH/jyTViP
+2OADvluZDKY+hT7/tLE49WelB8De8j/0vXSGPzo8lnByb0HzI8IHL9zBYwPjGWUA
+bZvMU1AbmgTRKl/7L4A5yIaN6y6gPi90sXgSu+uPmjp8tz+yUS+2Md80mKZ6G+iU
+uLKnSR/B6YsXDOd8e7YClTO8SUTY87kSp4GBP1hJ5hDErht5ejoegE76SIRaQdCu
+Xk9mwvVrCjWNVhJNNBGZHoTc1UNIN4ZngczeoG+EgRcH0ittSQhRVdZJ3mAiD15B
+BxWPST7Tzz3HWwVFJ3drT+oWd+RqGovcwhDs4xhod2n9bB3h9Mxs/RQBCz5T7Qme
+igQ4/prlhhWJorTjzHAQa1vlvrlSmjUCX8UemjPHQKD4L69SiYmkzDO6XUBlPaXL
+N5QMPIxEFoLjzyW9jofUNQIkln6ydliTRJHFO/t3T3asP+CgTJyPMk9EL83pMrck
+63rcbDj8hbFrKh9CVVk3YnoIS9H0soE7jrq6F4wo3H9mk+IoNmO/rDSeNbZZ81gE
+smtBxsFYuooBSe83V2fmM4YZxIET3N5ieULZqct0rGgc0g+30Sb5hsuhzyUniVjo
+cNdOgJ0//cf0B7qnnhAaHFjIdRy3z+zJwH5IKaRGLnrmg+UocmhijpTe0tMadS1v
+G+TSUk7Ny9B4GXvUt+Hk
+=w27B
+-----END PGP SIGNATURE-----
diff --git a/net-wireless/gnuradio/gnuradio-3.5.3.2.ebuild b/net-wireless/gnuradio/gnuradio-3.6.4.1.ebuild
index d0eba4401f0e..ac1f32b6a9fa 100644
--- a/net-wireless/gnuradio/gnuradio-3.5.3.2.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.6.4.1.ebuild
@@ -1,69 +1,86 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.5.3.2.ebuild,v 1.4 2013/03/02 23:12:03 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.6.4.1.ebuild,v 1.1 2013/03/18 21:48:33 zerochaos Exp $
-EAPI=4
+EAPI=5
PYTHON_DEPEND="2"
-inherit eutils fdo-mime python
+inherit base cmake-utils fdo-mime python
DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
HOMEPAGE="http://gnuradio.org/"
-SRC_URI="http://gnuradio.org/redmine/attachments/download/324/${P}.tar.gz"
-
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64"
-IUSE="audio doc dot examples fcd grc guile qt4 sdl utils wxwidgets"
-REQUIRED_USE="utils? ( wxwidgets )
- fcd? ( audio )"
+
+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 ~x86"
+fi
+
+IUSE="alsa doc examples fcd filter grc jack oss performance-counters portaudio qt4 sdl uhd utils wavelet wxwidgets"
# bug #348206
# comedi? ( >=sci-electronics/comedilib-0.7 )
-# uhd? ( dev-libs/uhd )
-RDEPEND="dev-libs/boost
- dev-python/numpy
+# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
+RDEPEND=">=dev-lang/orc-0.4.12
+ dev-libs/boost
+ !<=dev-libs/boost-1.52.0-r6:0/1.52
+ dev-python/cheetah
dev-util/cppunit
sci-libs/fftw:3.0
- sci-libs/gsl
- virtual/cblas
fcd? ( virtual/libusb:1 )
- audio? (
+ alsa? (
media-libs/alsa-lib
- media-sound/jack-audio-connection-kit
- >=media-libs/portaudio-19_pre
)
grc? (
- dev-python/cheetah
dev-python/lxml
+ dev-python/numpy
dev-python/pygtk:2
)
- guile? ( >=dev-scheme/guile-1.8.4 )
+ 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
)
"
-# gnuradio links against older version of itself during build
DEPEND="${RDEPEND}
- !!<${CATEGORY}/${P}
dev-lang/swig
virtual/pkgconfig
doc? (
- >=app-doc/doxygen-1.5.7.1[dot?]
- app-text/xmlto
+ >=app-doc/doxygen-1.5.7.1
+ dev-python/sphinx
)
grc? (
x11-misc/xdg-utils
)
+ oss? (
+ virtual/os-headers
+ )
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.6.1-automagic-audio.patch
+)
+
pkg_setup() {
python_set_active_version 2
python_pkg_setup
@@ -73,70 +90,62 @@ 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
- # TODO: DEPDIR is not created, need to investigate why
- mkdir "${S}"/gnuradio-core/src/lib/general/.deps || die
- mkdir "${S}"/gnuradio-core/src/lib/gengen/.deps || die
- mkdir "${S}"/gr-trellis/src/lib/.deps || die
+ base_src_prepare
}
src_configure() {
- # --with-lv_arch=32 fails to build on amd64
- # TODO: more elegant solution is required before keywording on other arches
# TODO: docs are installed to /usr/share/doc/${PN} not /usr/share/doc/${PF}
- econf \
- --enable-all-components \
- --enable-gnuradio-core \
- --enable-gruel \
- --enable-python \
- --disable-gr-comedi \
- --disable-gr-shd \
- --disable-gr-uhd \
- --with-lv_arch="generic 64 3dnow abm popcount mmx sse sse2 sse3 ssse3 sse4_a sse4_1 sse4_2 avx" \
- $(use_enable audio gr-audio) \
- $(use_enable doc doxygen) \
- $(use_enable doc docs) \
- $(use_enable dot) \
- $(use_enable examples gnuradio-examples) \
- $(use_enable fcd gr-fcd) \
- $(use_enable grc) \
- $(use_enable guile) \
- $(use_enable utils gr-utils) \
- $(use_enable wxwidgets gr-wxgui) \
- $(use_enable sdl gr-video-sdl) \
- $(use sdl || echo "--disable-sdltest") \
- $(use_enable qt4 gr-qtgui) \
- $(use_with qt4 qwt-incdir "${EPREFIX}"/usr/include/qwt5)
+ # SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
+ mycmakeargs=(
+ $(cmake-utils_use_enable alsa GR_AUDIO_ALSA)
+ $(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 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
+ -DQWT_INCLUDE_DIRS="${EPREFIX}"/usr/include/qwt5
+ -DSYSCONFDIR="${EPREFIX}"/etc
+ )
+ cmake-utils_src_configure
}
src_install() {
- # Fails to install with parallel make sometimes, bug #412449
- emake -j1 DESTDIR="${ED}" 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/gnuradio/examples "${ED}"/usr/share/doc/${PF}/ || die "failed installing examples"
+ mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
else
- # It seems that the examples are installed whether configured or not
- rm -rf "${ED}"/usr/share/gnuradio/examples || die
- fi
-
- # Remove useless files in the doc dir
- if use doc; then
- rm -f "${ED}"/usr/share/doc/${P}/html/*.md5 || die
+ # 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/gnuradio/grc/freedesktop || die
- rm -f "${ED}"/usr/bin/grc_setup_freedesktop || die
+ 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}/gnuradio-grc.xml"
+ doins "${fd_path}/${PN}-grc.xml"
domenu "${fd_path}/"*.desktop
doicon "${fd_path}/"*.png
@@ -153,10 +162,10 @@ pkg_postinst()
fdo-mime_mime_database_update
for size in ${GRC_ICON_SIZES} ; do
xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
- "${ROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
+ "${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} \
- "${ROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
+ "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
|| die "icon resource installation failed"
done
xdg-icon-resource forceupdate
diff --git a/net-wireless/gnuradio/metadata.xml b/net-wireless/gnuradio/metadata.xml
index d4f80a97ed18..68b921b24c53 100644
--- a/net-wireless/gnuradio/metadata.xml
+++ b/net-wireless/gnuradio/metadata.xml
@@ -3,8 +3,6 @@
<pkgmetadata>
<herd>radio</herd>
<use>
- <flag name='audio'>enable audio output</flag>
- <flag name='dot'>create dot graphs in documentation</flag>
<flag name='fcd'>enable Funcube Dongle source block</flag>
<flag name='filter'>enable filter signal processing blocks</flag>
<flag name='grc'>enable GNU Radio Companion graphical tool to design signal processing flow graphs</flag>