cleaned up ebuild, added logic to switch to python2 as required for this particular waf, bug 419039 , thanks to aballier

(Portage version: 2.1.10.49/cvs/Linux x86_64)

2 files changed, 17 insertions, 19 deletions

diff --git a/x11-libs/flowcanvas/ChangeLog b/x11-libs/flowcanvas/ChangeLog
index 8e024a0a9e25..339479562c83 100644
--- a/x11-libs/flowcanvas/ChangeLog
+++ b/x11-libs/flowcanvas/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/flowcanvas
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/flowcanvas/ChangeLog,v 1.14 2012/05/05 03:52:25 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/flowcanvas/ChangeLog,v 1.15 2012/06/01 19:59:46 axs Exp $
+
+  01 Jun 2012; Ian Stakenvicius <axs@gentoo.org> flowcanvas-0.7.1.ebuild:
+  cleaned up ebuild, added logic to switch to python2 as required for this
+  particular waf, bug 419039 , thanks to aballier
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> flowcanvas-0.5.1.ebuild,
   flowcanvas-0.6.0.ebuild, flowcanvas-0.6.4.ebuild, flowcanvas-0.7.1.ebuild:
diff --git a/x11-libs/flowcanvas/flowcanvas-0.7.1.ebuild b/x11-libs/flowcanvas/flowcanvas-0.7.1.ebuild
index d5303815dba6..4a373b445be1 100644
--- a/x11-libs/flowcanvas/flowcanvas-0.7.1.ebuild
+++ b/x11-libs/flowcanvas/flowcanvas-0.7.1.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/x11-libs/flowcanvas/flowcanvas-0.7.1.ebuild,v 1.5 2012/05/05 03:52:25 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/flowcanvas/flowcanvas-0.7.1.ebuild,v 1.6 2012/06/01 19:59:46 axs Exp $
 
-EAPI=2
+EAPI=4
 
-inherit toolchain-funcs multilib eutils
+inherit waf-utils python eutils
 
 DESCRIPTION="Gtkmm/Gnomecanvasmm widget for boxes and lines environments"
 HOMEPAGE="http://wiki.drobilla.net/FlowCanvas"
@@ -20,29 +20,23 @@ RDEPEND="dev-libs/boost
 	>=dev-cpp/libgnomecanvasmm-2.6:2.6
 	media-gfx/graphviz"
 DEPEND="${RDEPEND}
+	=dev-lang/python-2*
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
+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") \
-		|| die
-}
-
-src_compile() {
-	./waf || die
-}
-
-src_install() {
-	./waf install --destdir="${D}" || die
-	dodoc AUTHORS README ChangeLog || die
+		$(use doc && echo "--doc")
 }