bugfix release, remove old ebuild

(Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)

3 files changed, 83 insertions, 70 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/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>