cleaned up ebuild, added logic to switch to python2 as required for this particular waf

(Portage version: 2.1.10.49/cvs/Linux x86_64)

2 files changed, 16 insertions, 19 deletions

diff --git a/media-libs/raul/ChangeLog b/media-libs/raul/ChangeLog
index f8486919eb1e..fa1423afd91d 100644
--- a/media-libs/raul/ChangeLog
+++ b/media-libs/raul/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/raul
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/raul/ChangeLog,v 1.14 2012/05/05 08:02:25 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/raul/ChangeLog,v 1.15 2012/06/01 20:25:07 axs Exp $
+
+  01 Jun 2012; Ian Stakenvicius <axs@gentoo.org> raul-0.8.0.ebuild:
+  cleaned up ebuild, added logic to switch to python2 as required for this
+  particular waf
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> raul-0.5.1.ebuild,
   raul-0.6.0.ebuild, raul-0.7.0.ebuild, raul-0.8.0.ebuild:
diff --git a/media-libs/raul/raul-0.8.0.ebuild b/media-libs/raul/raul-0.8.0.ebuild
index 70400db11daa..bd3c9ad91adf 100644
--- a/media-libs/raul/raul-0.8.0.ebuild
+++ b/media-libs/raul/raul-0.8.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/raul/raul-0.8.0.ebuild,v 1.4 2012/05/05 08:02:25 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/raul/raul-0.8.0.ebuild,v 1.5 2012/06/01 20:25:07 axs Exp $
 
-EAPI=2
+EAPI=4
 
-inherit toolchain-funcs multilib eutils
+inherit waf-utils python eutils
 
 DESCRIPTION="C++ utility library primarily aimed at audio/musical applications."
 HOMEPAGE="http://wiki.drobilla.net/Raul"
@@ -18,29 +18,27 @@ IUSE="debug doc test"
 RDEPEND="dev-libs/boost
 	>=dev-libs/glib-2.14.0"
 DEPEND="${RDEPEND}
+	=dev-lang/python-2*
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
 RAUL_TESTS="atomic_test atom_test list_test midi_ringbuffer_test path_test quantize_test queue_test ringbuffer_test smf_test table_test thread_test time_test"
+DOCS=( AUTHORS README ChangeLog )
+
+pkg_setup() {
+	python_set_active_version 2
+}
 
 src_prepare() {
 	epatch "${FILESDIR}/ldconfig2.patch"
 }
 
 src_configure() {
-	tc-export CC CXX CPP AR RANLIB
-	./waf configure \
-		--prefix=/usr \
-		--libdir=/usr/$(get_libdir) \
+	waf-utils_src_configure \
 		--htmldir=/usr/share/doc/${PF}/html \
 		$(use debug && echo "--debug") \
 		$(use doc && echo "--docs") \
-		$(use test && echo "--test") \
-		|| die
-}
-
-src_compile() {
-	./waf || die
+		$(use test && echo "--test")
 }
 
 src_test() {
@@ -50,8 +48,3 @@ src_test() {
 		LD_LIBRARY_PATH=.. ./${i} || die
 	done
 }
-
-src_install() {
-	./waf install --destdir="${D}" || die
-	dodoc AUTHORS README ChangeLog || die
-}