summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2012-04-18 09:30:58 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2012-04-18 09:30:58 +0000
commit6ea91046825c0cc19a1c35a4ce5feec25c37bfd7 (patch)
tree299728a58f232d03ccbb2ff025491a3ece3f73a1 /net-wireless
parentVersion bump, thanks everyone in bug #297128. Remove old (diff)
downloadhistorical-6ea91046825c0cc19a1c35a4ce5feec25c37bfd7.tar.gz
historical-6ea91046825c0cc19a1c35a4ce5feec25c37bfd7.tar.bz2
historical-6ea91046825c0cc19a1c35a4ce5feec25c37bfd7.zip
Fix building in the absence of qt-qt3support, add -j1 to emake install, bug #412449.
Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/gnuradio/ChangeLog7
-rw-r--r--net-wireless/gnuradio/Manifest4
-rw-r--r--net-wireless/gnuradio/gnuradio-3.5.3.ebuild7
3 files changed, 13 insertions, 5 deletions
diff --git a/net-wireless/gnuradio/ChangeLog b/net-wireless/gnuradio/ChangeLog
index 07966539da40..fc98f7e8e363 100644
--- a/net-wireless/gnuradio/ChangeLog
+++ b/net-wireless/gnuradio/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-wireless/gnuradio
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.3 2012/04/18 09:05:01 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.4 2012/04/18 09:30:58 chithanh Exp $
+
+ 18 Apr 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ gnuradio-3.5.3.ebuild:
+ Fix building in the absence of qt-qt3support, add -j1 to emake install, bug
+ #412449.
18 Apr 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
gnuradio-3.5.3.ebuild:
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 0a7c487c1d50..2a66d5bf71c5 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,4 +1,4 @@
DIST gnuradio-3.5.3.tar.gz 4330883 RMD160 1400582718c45de6486d0d409d6b61aceacf5927 SHA1 661b9ac54cefa6d1b3de3dbd4f3bf466ac846ee4 SHA256 7c3a12233189f5334a7023c6cefdac506ccf7d55cc0cd965870f6f736211608f
-EBUILD gnuradio-3.5.3.ebuild 4836 RMD160 1507e0464d8479ac6a3120c849fe7996836c33de SHA1 861222ae21a13496a0156518f5b591f66aa184e4 SHA256 48f60c14891700f4d2b5d51a8ef69a35f4cdc162ba4a4640acdd81ec7da3a9b8
-MISC ChangeLog 675 RMD160 d98d5f0d6268c059241363876e89f3190078e18a SHA1 5875b7d4a8d915543fe9277d18ee18823b9dd247 SHA256 997e8a8cfcb9642b04c7c7c38d441f35178b884b8a6021bef20d36fb3a27a57b
+EBUILD gnuradio-3.5.3.ebuild 5047 RMD160 f8a3e5c638037e2bb52f764640f6323ec6d28420 SHA1 0ee13c34396dbcd6a2261deef04e5607054833ed SHA256 8e472d94c74aa1c72f47f13d402cf2c556815ceb458271df10d89c5711c7bb28
+MISC ChangeLog 859 RMD160 0c7bda3d41fd9f21786a36c71bbba6e0ae033028 SHA1 c1d93702d2b5523d6a9ea8cdf38b311182b68155 SHA256 3fa3615b89813e82b82e3fcb2ba31faf663b8cbdf06789d0dc3fe1a82d6ef0a3
MISC metadata.xml 654 RMD160 174932e0ee2d7f490ff7409881e19f528c001991 SHA1 5ac43c785e2dc66aded860a01d1f7e0a4a16496b SHA256 5b95faa2ff38c43ce0b17fbb2f01f73bbfbe20e42546f68cb1fcd5cf597e9261
diff --git a/net-wireless/gnuradio/gnuradio-3.5.3.ebuild b/net-wireless/gnuradio/gnuradio-3.5.3.ebuild
index e2c173bcbd68..9aec8c8c1df4 100644
--- a/net-wireless/gnuradio/gnuradio-3.5.3.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.5.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 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.ebuild,v 1.3 2012/04/18 09:05:01 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.5.3.ebuild,v 1.4 2012/04/18 09:30:58 chithanh Exp $
EAPI=4
PYTHON_DEPEND="2"
@@ -69,6 +69,8 @@ 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
# 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
@@ -105,7 +107,8 @@ src_configure() {
}
src_install() {
- emake DESTDIR="${ED}" install
+ # Fails to install with parallel make sometimes, bug #412449
+ emake -j1 DESTDIR="${ED}" install
python_clean_installation_image -q