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

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

3 files changed, 28 insertions, 21 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/Manifest b/media-libs/raul/Manifest
index cf873ef909a2..1266a9dfdc5d 100644
--- a/media-libs/raul/Manifest
+++ b/media-libs/raul/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX ldconfig.patch 441 RMD160 84edb43236c6b63e64a5a9a125cc2f515d4e9cc2 SHA1 7c3a3156a74ba5d0f0545c7e7255cd0b6d76a359 SHA256 492e270623f07fbf4f748ee94056a1e30d012dd40cb07203d4dfdce0a9aed19b
 AUX ldconfig2.patch 366 RMD160 429931a83b8bb3149e042dfdabb44c31bbcac3d4 SHA1 4b826b09df5373aaa5ce1be0991328291864dd69 SHA256 fe47d16cec0c9bee90a2b9d125305753567e290de22ccaa36f1259618a70bcd2
 AUX raul-0.5.1-gcc44.patch 816 RMD160 33dce187a2b4c805df0024065d2e5818f55d6de6 SHA1 2f63ed9a3d000d5cd7f06024d972ae4777375ca8 SHA256 6800e2e498aba0217f1cb038489a3f5620a482682bab4d58cd78003230fc1915
@@ -8,6 +11,13 @@ DIST raul-0.8.0.tar.bz2 155450 RMD160 a80d50057596a0abc38ef72a95b3895dec72aa6e S
 EBUILD raul-0.5.1.ebuild 1168 RMD160 4474c77987869b77f68eacf694a4d2052769ced8 SHA1 69c4138996420ae26c58d4fc4d1e94eb07419d45 SHA256 b87d338e04a03bbbd04d4f316e393f2bcd973999c2fdabee9ae85aedba8931a9
 EBUILD raul-0.6.0.ebuild 1337 RMD160 b00be056ff3c27162c1df4ff700c63bc63cdecd3 SHA1 8edc77ad3fa6176a6ff9a9ecbf563cc19729f583 SHA256 f0e80e0530e1235fee2915fd7f346ff21bb6190d17750643aeb0047d56d51ff2
 EBUILD raul-0.7.0.ebuild 1478 RMD160 94d51e2deae966a960914238f07f3dde7df6f6a1 SHA1 a522b121e5079f162eb6a1016685999ef5c6c3bf SHA256 cd5f4c7358de36199cd66800306a38dc7a9e0ec3674e6887dd6abfddf82852d8
-EBUILD raul-0.8.0.ebuild 1384 RMD160 8dad98d63a7a3475a5a852ea9862751fe6a789e6 SHA1 0f488bbaf4b1d2c322349279c4bb691119ed16d8 SHA256 55ea3b7d2774b122f5923acf440154f75dd2ea581077b9d65580b1c61c007ff9
-MISC ChangeLog 2075 RMD160 dd2cdf13a40c23407742df02243a9b218b7ad31e SHA1 9fcd16f5d49506b1b5f0a4c752ed4d870bee89cb SHA256 9d600e079337a0f9793968f5d6e08c74c252e30b0aae2ea8b2381cc4be2b922d
+EBUILD raul-0.8.0.ebuild 1259 RMD160 eeeb30b06d338ac475dc5dd86c8a35a6a727ae10 SHA1 3cecd5c112b2c4cbc1e45cb3078f8274b0561222 SHA256 325a63c2acee41b15927b32a05882056d099ff0e6344afa4d6c6419f22509c86
+MISC ChangeLog 2233 RMD160 e86f2d74e93c1bd9a59d83c4e5c241ff94c3e2d5 SHA1 e05164c20997987fada669a80119dd067eeba121 SHA256 2b4e08f8b0e1a54e65ebf2a6f76d48feb1c270f22172ca244a54c695b11e5e7e
 MISC metadata.xml 321 RMD160 0fc4ae9547124ca7a8b3b162810c37af89202efe SHA1 ee9300170040dcd38a4d6d5da83e35872af1085b SHA256 4a9071c58dff9396449851c754d7da9efe85be74b0f86d05af15e36a06489130
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk/JJTkACgkQ2ugaI38ACPD/AQEArhngAbElStes1Ncgl8c6mkgN
+naXEG8TncMqPA5TVhk4BALScOHYg4Pco0HHmuTgwjng5Okwllo3P0+hoyIWt9wor
+=pq1x
+-----END PGP SIGNATURE-----
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
-}