Version bump.

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

4 files changed, 112 insertions, 59 deletions

diff --git a/net-wireless/gnuradio/ChangeLog b/net-wireless/gnuradio/ChangeLog
index 3f30938222ba..6038421caa46 100644
--- a/net-wireless/gnuradio/ChangeLog
+++ b/net-wireless/gnuradio/ChangeLog
@@ -1,6 +1,13 @@
 # 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.6 2012/05/04 06:41:54 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.7 2012/05/05 19:19:35 chithanh Exp $
+
+*gnuradio-3.6.0 (05 May 2012)
+
+  05 May 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/gnuradio-3.6.0-cmake-sysconfdir.patch, +gnuradio-3.6.0.ebuild,
+  -gnuradio-3.5.3.ebuild, metadata.xml:
+  Version bump.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> gnuradio-3.5.3.ebuild,
   gnuradio-3.5.3.2.ebuild:
diff --git a/net-wireless/gnuradio/files/gnuradio-3.6.0-cmake-sysconfdir.patch b/net-wireless/gnuradio/files/gnuradio-3.6.0-cmake-sysconfdir.patch
new file mode 100644
index 000000000000..02f94b32d57f
--- /dev/null
+++ b/net-wireless/gnuradio/files/gnuradio-3.6.0-cmake-sysconfdir.patch
@@ -0,0 +1,60 @@
+diff -ur a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
+--- a/gnuradio-core/CMakeLists.txt	2012-04-21 21:00:33.000000000 +0200
++++ b/gnuradio-core/CMakeLists.txt	2012-05-05 20:05:52.000000000 +0200
+@@ -109,7 +109,7 @@
+ 
+ install(
+     FILES gnuradio-core.conf
+-    DESTINATION ${GR_PKG_CONF_DIR}
++    DESTINATION ${GR_PREFSDIR}
+     COMPONENT "core_runtime"
+ )
+ 
+diff -ur a/gnuradio-core/src/lib/general/CMakeLists.txt b/gnuradio-core/src/lib/general/CMakeLists.txt
+--- a/gnuradio-core/src/lib/general/CMakeLists.txt	2012-04-21 21:00:33.000000000 +0200
++++ b/gnuradio-core/src/lib/general/CMakeLists.txt	2012-05-05 21:14:44.000000000 +0200
+@@ -48,8 +48,9 @@
+ 
+ message(STATUS "Loading version ${VERSION} into gr_constants...")
+ 
+-file(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}/${GR_CONF_DIR}"     SYSCONFDIR)
+-file(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}/${GR_PKG_CONF_DIR}" GR_PREFSDIR)
++set(SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/${GR_CONF_DIR}" CACHE PATH "System configuration directory")
++file(TO_NATIVE_PATH "${SYSCONFDIR}"     SYSCONFDIR)
++file(TO_NATIVE_PATH "${SYSCONFDIR}/${CMAKE_PROJECT_NAME}/conf.d" GR_PREFSDIR)
+ 
+ #double escape for windows backslash path separators
+ string(REPLACE "\\" "\\\\" prefix ${prefix})
+diff -ur a/gr-audio/lib/CMakeLists.txt b/gr-audio/lib/CMakeLists.txt
+--- a/gr-audio/lib/CMakeLists.txt	2012-04-21 21:00:33.000000000 +0200
++++ b/gr-audio/lib/CMakeLists.txt	2012-05-05 20:06:08.000000000 +0200
+@@ -150,4 +150,4 @@
+ target_link_libraries(gnuradio-audio ${gr_audio_libs})
+ GR_LIBRARY_FOO(gnuradio-audio RUNTIME_COMPONENT "audio_runtime" DEVEL_COMPONENT "audio_devel")
+ 
+-install(FILES ${gr_audio_confs} DESTINATION ${GR_PKG_CONF_DIR} COMPONENT "audio_runtime")
++install(FILES ${gr_audio_confs} DESTINATION ${GR_PREFSDIR} COMPONENT "audio_runtime")
+diff -ur a/grc/CMakeLists.txt b/grc/CMakeLists.txt
+--- a/grc/CMakeLists.txt	2012-04-21 21:00:33.000000000 +0200
++++ b/grc/CMakeLists.txt	2012-05-05 20:05:16.000000000 +0200
+@@ -75,7 +75,7 @@
+ 
+ install(
+     FILES ${CMAKE_CURRENT_BINARY_DIR}/grc.conf
+-    DESTINATION ${GR_PKG_CONF_DIR}
++    DESTINATION ${GR_PREFSDIR}
+     COMPONENT "grc"
+ )
+ 
+diff -ur a/gr-wxgui/CMakeLists.txt b/gr-wxgui/CMakeLists.txt
+--- a/gr-wxgui/CMakeLists.txt	2012-04-21 21:00:33.000000000 +0200
++++ b/gr-wxgui/CMakeLists.txt	2012-05-05 20:06:17.000000000 +0200
+@@ -76,7 +76,7 @@
+ ########################################################################
+ install(
+     FILES ${CMAKE_CURRENT_SOURCE_DIR}/gr-wxgui.conf
+-    DESTINATION ${GR_PKG_CONF_DIR}
++    DESTINATION ${GR_PREFSDIR}
+     COMPONENT "wxgui"
+ )
+ 
diff --git a/net-wireless/gnuradio/gnuradio-3.5.3.ebuild b/net-wireless/gnuradio/gnuradio-3.6.0.ebuild
index 551ea4092357..61b6dcc19991 100644
--- a/net-wireless/gnuradio/gnuradio-3.5.3.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.6.0.ebuild
@@ -1,32 +1,29 @@
 # 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.5 2012/05/04 06:41:54 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.6.0.ebuild,v 1.1 2012/05/05 19:19:35 chithanh Exp $
 
 EAPI=4
 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/320/${P}.tar.gz"
+SRC_URI="http://gnuradio.org/redmine/attachments/download/326/${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 )"
+KEYWORDS="~amd64 ~x86"
+IUSE="audio doc examples fcd grc qt4 sdl utils wavelet wxwidgets"
+REQUIRED_USE="fcd? ( audio )"
 
 # bug #348206
 # comedi? ( >=sci-electronics/comedilib-0.7 )
 # uhd? ( dev-libs/uhd )
-RDEPEND="dev-libs/boost
-	dev-python/numpy
+RDEPEND=">=dev-lang/orc-0.4.12
+	dev-libs/boost
 	dev-util/cppunit
 	sci-libs/fftw:3.0
-	sci-libs/gsl
-	virtual/cblas
 	fcd? ( virtual/libusb:1 )
 	audio? (
 		media-libs/alsa-lib
@@ -36,15 +33,18 @@ RDEPEND="dev-libs/boost
 	grc? (
 		dev-python/cheetah
 		dev-python/lxml
+		dev-python/numpy
 		dev-python/pygtk:2
 	)
-	guile? ( >=dev-scheme/guile-1.8.4 )
 	qt4? (
 		dev-python/PyQt4[X,opengl]
 		dev-python/pyqwt:5
 		x11-libs/qt-gui
 	)
 	sdl? ( media-libs/libsdl )
+	wavelet? (
+		sci-libs/gsl
+	)
 	wxwidgets? (
 		dev-python/wxpython:2.8
 		dev-python/numpy
@@ -54,14 +54,17 @@ DEPEND="${RDEPEND}
 	dev-lang/swig
 	virtual/pkgconfig
 	doc? (
-		>=app-doc/doxygen-1.5.7.1[dot?]
-		app-text/xmlto
+		>=app-doc/doxygen-1.5.7.1
 	)
 	grc? (
 		x11-misc/xdg-utils
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.6.0-cmake-sysconfdir.patch
+)
+
 pkg_setup() {
 	python_set_active_version 2
 	python_pkg_setup
@@ -71,70 +74,52 @@ 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 audio GR_AUDIO)
+		$(cmake-utils_use_enable doc DOXYGEN) \
+		$(cmake-utils_use_enable fcd GR_FCD) \
+		$(cmake-utils_use_enable grc GRC) \
+		$(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
 
 	# 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
@@ -151,10 +136,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 391ed9871094..f1d674105787 100644
--- a/net-wireless/gnuradio/metadata.xml
+++ b/net-wireless/gnuradio/metadata.xml
@@ -11,6 +11,7 @@
 		<flag name='fcd'>enable Funcube Dongle source block</flag>
 		<flag name='grc'>enable GNU Radio Companion graphical tool to design signal processing flow graphs</flag>
 		<flag name='utils'>install scripts to enable viewing and analysis of files produced by flow graphs</flag>
+		<flag name='wavelet'>enable wavelet signal processing blocks</flag>
 	</use>
 </pkgmetadata>