summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRick Farina <zerochaos@gentoo.org>2014-07-26 05:21:50 +0000
committerRick Farina <zerochaos@gentoo.org>2014-07-26 05:21:50 +0000
commit7983c11136dce613c11776a25dcbd4ff561ee864 (patch)
tree3f65e1110797c9b1b3be0040c203e300a3f7df5b
parentRemove old (diff)
downloadgentoo-2-7983c11136dce613c11776a25dcbd4ff561ee864.tar.gz
gentoo-2-7983c11136dce613c11776a25dcbd4ff561ee864.tar.bz2
gentoo-2-7983c11136dce613c11776a25dcbd4ff561ee864.zip
fix deps, ctrlport was missing Ice
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)
-rw-r--r--net-wireless/gnuradio/ChangeLog6
-rw-r--r--net-wireless/gnuradio/gnuradio-3.7.4.ebuild5
-rw-r--r--net-wireless/gnuradio/gnuradio-9999.ebuild5
3 files changed, 13 insertions, 3 deletions
diff --git a/net-wireless/gnuradio/ChangeLog b/net-wireless/gnuradio/ChangeLog
index a39b48bd45b4..200c751c804f 100644
--- a/net-wireless/gnuradio/ChangeLog
+++ b/net-wireless/gnuradio/ChangeLog
@@ -1,6 +1,10 @@
# 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.43 2014/07/22 17:48:16 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.44 2014/07/26 05:21:50 zerochaos Exp $
+
+ 26 Jul 2014; Rick Farina <zerochaos@gentoo.org> gnuradio-3.7.4.ebuild,
+ gnuradio-9999.ebuild:
+ fix deps, ctrlport was missing Ice
22 Jul 2014; Rick Farina <zerochaos@gentoo.org> gnuradio-3.7.4.ebuild:
adding ~arm keyword back
diff --git a/net-wireless/gnuradio/gnuradio-3.7.4.ebuild b/net-wireless/gnuradio/gnuradio-3.7.4.ebuild
index 810e9d333e56..a6ee00854045 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.4.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.4.ebuild
@@ -1,6 +1,6 @@
# 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.4.ebuild,v 1.2 2014/07/22 17:48:16 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.7.4.ebuild,v 1.3 2014/07/26 05:21:50 zerochaos Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
@@ -46,6 +46,7 @@ RDEPEND="${PYTHON_DEPS}
alsa? (
media-libs/alsa-lib[${PYTHON_USEDEP}]
)
+ ctrlport? ( dev-libs/Ice )
fcd? ( virtual/libusb:1 )
filter? ( sci-libs/scipy )
grc? (
@@ -102,6 +103,8 @@ src_prepare() {
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
+ #this flag breaks everything, but more likely it's a sign we need to work on this
+ #-DENABLE_DEFAULT=OFF
mycmakeargs=(
$(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
$(cmake-utils_use_enable analog GR_ANALOG) \
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 157b05b7bba9..f10fb34a05e3 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -1,6 +1,6 @@
# 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.13 2014/07/22 15:28:39 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild,v 1.14 2014/07/26 05:21:50 zerochaos Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
@@ -46,6 +46,7 @@ RDEPEND="${PYTHON_DEPS}
alsa? (
media-libs/alsa-lib[${PYTHON_USEDEP}]
)
+ ctrlport? ( dev-libs/Ice )
fcd? ( virtual/libusb:1 )
filter? ( sci-libs/scipy )
grc? (
@@ -102,6 +103,8 @@ src_prepare() {
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
+ #this flag breaks everything, but more likely it's a sign we need to work on this
+ #-DENABLE_DEFAULT=OFF
mycmakeargs=(
$(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
$(cmake-utils_use_enable analog GR_ANALOG) \