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

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

3 files changed, 29 insertions, 21 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/Manifest b/x11-libs/flowcanvas/Manifest
index 7c17311cdb38..769660ab485b 100644
--- a/x11-libs/flowcanvas/Manifest
+++ b/x11-libs/flowcanvas/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX ldconfig.patch 441 RMD160 84edb43236c6b63e64a5a9a125cc2f515d4e9cc2 SHA1 7c3a3156a74ba5d0f0545c7e7255cd0b6d76a359 SHA256 492e270623f07fbf4f748ee94056a1e30d012dd40cb07203d4dfdce0a9aed19b
 AUX ldconfig2.patch 329 RMD160 d7cc3aabe0c03c94849fa3b39f8cc852916d334e SHA1 b43ff3143345a4ee24bab625c2cf06f671c67ae8 SHA256 bcfa699e3b8af11e4fa63fa1fc69d95e217887dafee876f507e14a3525ec420a
 DIST flowcanvas-0.5.1.tar.gz 366502 RMD160 071c8793e174568df5318b6b2a23a86a39dc5916 SHA1 6aff607ba23cd56e7c117d73cd06b126cc2e6ec9 SHA256 43c8cad97981732d53a11ceaac27fb9f3a378ae0050694bfb79567b107b276a5
@@ -7,6 +10,13 @@ DIST flowcanvas-0.7.1.tar.bz2 139471 RMD160 31e9c5daea989e3ad5fd16b874cc527c8a27
 EBUILD flowcanvas-0.5.1.ebuild 946 RMD160 b68278b97cc9beb4aac861b085206bd5a6b1c4e0 SHA1 da68238e164daea05499332f3a2ddf9204945046 SHA256 fa4d3d79a22595784281afdaf4f51ce10ec8591c598edbfd56f3445bde5acbda
 EBUILD flowcanvas-0.6.0.ebuild 1109 RMD160 c972f78dbfcd59e81d37a7a9006a52dd11b4642c SHA1 f1d6c255ed0af3123397acfa826472bb493a7aa8 SHA256 4f9a0636f5e74d305a8e7ae6f1eaa1c3dc6e77f08cd3d31656e7ae24d59a5e68
 EBUILD flowcanvas-0.6.4.ebuild 1103 RMD160 062de87ec1f914f4d5367e803be394011680d4ea SHA1 41e86879fa66974bb443589f850cf6f73b59a6c5 SHA256 5103f4e751d82c04d413d75b40ad9e6cf6d787eefe450504e16f6ab1b047f71d
-EBUILD flowcanvas-0.7.1.ebuild 1109 RMD160 fec9272ffb0411f22f907f15115a44c55fbbff43 SHA1 a6252f1605311559a6490da70d557ddbca767217 SHA256 bb9d62c60ef4510fb0e3434ef85ab45042cbfe12012cb83415f5f248af925960
-MISC ChangeLog 2249 RMD160 092206f981949eb082ae18dab5b33fdee6675253 SHA1 00f130eae7be29b6ddfe002d7c256880f84aef00 SHA256 043c93619d26a3843aa4371a91e7f2e1c24d23b325b3fece630b12efc460989f
+EBUILD flowcanvas-0.7.1.ebuild 984 RMD160 ab52839742dae55e562a63a65c43a040547fa87a SHA1 73b68d2ee06fbf7b6d4788b24ca86e4953bdb6b4 SHA256 6ccc66235680e5fd5a81c1d4df1a93dcdde59dd76fde101fe03cc20e9a93dbf1
+MISC ChangeLog 2446 RMD160 8710cdd94eaa190f13c4a301ef7859e0c96faf27 SHA1 18abdadbeaa961beaacd5fa57643b116bbf01296 SHA256 aba939581f446bf1c442288793e18c70d9b5447571bb545346cdd13c639359b0
 MISC metadata.xml 369 RMD160 f7dbb5911889435ddb7f35f066ccb617fed693ec SHA1 0fac22c24ef74268f2e03385461e176f6d37360b SHA256 df11a90ee23fef6075a7debf3b8db48d89ee1564f89a9d4bb9ed8a8bad5dc724
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk/JH0cACgkQ2ugaI38ACPCN5wEAvqb1yTB8LuL01VHPCZWtEruq
+TqLqJd1es0GYxOxCWCsA/jK6YMzscejo6mTmnISqnMAfc2a2O0SHUpkPuOadC7AY
+=sqiS
+-----END PGP SIGNATURE-----
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")
 }