[proaudio] [2323] non-mixer: wad support from Tina Cochet with some cleanup

[subversion@xxxxxxxxxxxxx]

Revision: 2323
Author:   dominique
Date:     2012-11-18 20:07:01 +0100 (Sun, 18 Nov 2012)
Log Message:
-----------
non-mixer: wad support from Tina Cochet with some cleanup

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/non-mixer/ChangeLog
    trunk/overlays/proaudio/media-sound/non-mixer/Manifest
    trunk/overlays/proaudio/media-sound/non-mixer/non-mixer-9999.ebuild

Modified: trunk/overlays/proaudio/media-sound/non-mixer/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/non-mixer/ChangeLog	2012-11-18 18:53:52 UTC (rev 2322)
+++ trunk/overlays/proaudio/media-sound/non-mixer/ChangeLog	2012-11-18 19:07:01 UTC (rev 2323)
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Nov 2012; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>
+  non-mixer-9999.ebuild: waf support from Tina Cochet ebuild with some cleanup
+
   04 Nov 2012; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>
   +non-mixer-9999.ebuild:
   From Tina Cochet ebuild with a few clean-up

Modified: trunk/overlays/proaudio/media-sound/non-mixer/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/non-mixer/Manifest	2012-11-18 18:53:52 UTC (rev 2322)
+++ trunk/overlays/proaudio/media-sound/non-mixer/Manifest	2012-11-18 19:07:01 UTC (rev 2323)
@@ -1,3 +1,3 @@
-EBUILD non-mixer-9999.ebuild 1055 SHA256 42ca3616665045228df81e5fd8cb8535769b7553ab6f66c90873ff5cb1bf439c SHA512 b6b1079753d21faab4419c16320b51be55a61c318e2a05d298b01dd79342773b1db46201bcf8a49bdefa92c2f93e7fd072a103349ec2a16fd032e6595ee01d30 WHIRLPOOL 495aae04af94ad2aca5663e1d182d739288df6838e6faced42371333b4adec7ffe21584279cfc8cf5e20e4f6b0b28047881a2b33334b608cbe54ceeddc1cfcd6
-MISC ChangeLog 260 SHA256 485c215054ae4270d5677afa0eac784f2c3884a2e1810eceff80be7848d0e110 SHA512 714c82097def6310c69bea4ccb958659c0cb9b7b36db89b479ddd0cef815b08b7a7def496f476b8208d3124257a896ec394cd029cd6216379e151b27e5bd1e8a WHIRLPOOL 2af3c55e0b178ec587d5d41118391e4c289bded18d042116a1816fc35fce76d185f221e947d88fc5dbe6d4870a80f96b7e7f8601643843c6716243fbdce2794e
+EBUILD non-mixer-9999.ebuild 1090 SHA256 8d1e7cbdde5bb1161e836454ce480a24e0fecff01a3af0ade8daf836ff58fca6 SHA512 97e50a381e3715b8e752c04c8d2ad347d98174045d2c5f46e7a499b0db95da12c996be53d53b6ef80cab8c165804bdf0241b749f635a90e43e13dd808576183b WHIRLPOOL 78d3b27f1d4d9178fb04150f6d425fdc7970c7dc627e405036aa7163764afaad4892fdd7a2577723757f2561df1345e1d2173ffd4cb1878d39642a137ac80c50
+MISC ChangeLog 406 SHA256 dfa2d4ad3cf98f40c6a796a7b5e9edd43e729b49051e0b4cf506b31d8615400b SHA512 a189f1b03c554c57eb33057596b5de208036815ba4314ea3ab7c574baa00951060d4c5bbd931ac5bfa62802b8af8fc47294e836520096c8fdc532708a6f5891a WHIRLPOOL a84ca5c00c7152571bd3355a023a095a38cf4f96305c75476bbfa212b333533d1baa805ffd5dddb5a818001d3cc0299ae5422e714bb5baa198d398c10f59da39
 MISC metadata.xml 268 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89 SHA512 3d709a016692f887d642d19b2644c10a09f666133f1f035b8a4c10e5772fbb39fa84a856a496d392594ccf850739fbf46ffa78ecc74214e8342ee97676b375e9 WHIRLPOOL 17c886c5b97925bd9223c0210170a63e55a2c2a238ae81ebf8efa14109d790406f45d0773d63bea825c1e40b058bd9e20a5d9c264da4db7c8fd2e556ecd83b2a

Modified: trunk/overlays/proaudio/media-sound/non-mixer/non-mixer-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/non-mixer/non-mixer-9999.ebuild	2012-11-18 18:53:52 UTC (rev 2322)
+++ trunk/overlays/proaudio/media-sound/non-mixer/non-mixer-9999.ebuild	2012-11-18 19:07:01 UTC (rev 2323)
@@ -4,11 +4,13 @@
 
 EAPI="4"
 
-inherit eutils git-2
+PYTHON_DEPEND="2"
+inherit waf-utils git-2 python
 
 DESCRIPTION="The Non Things: Non-DAW, Non-Mixer, Non-Sequencer and Non-Session-Manager"
 HOMEPAGE="http://non.tuxfamily.org";
 EGIT_REPO_URI="git://git.tuxfamily.org/gitroot/non/non.git"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
@@ -22,36 +24,33 @@
 	"
 DEPEND="${RDEPEND}
 	x11-libs/ntk
-	x11-libs/cairo 
-	x11-libs/libXft 
-	media-libs/libpng 
-	x11-libs/pixman 
-	x11-libs/libXpm 
-	virtual/jpeg 
+	x11-libs/cairo
+	x11-libs/libXft
+	media-libs/libpng
+	x11-libs/pixman
+	x11-libs/libXpm
+	virtual/jpeg
 	x11-libs/libXinerama
-	x11-libs/libxcb 
+	x11-libs/libxcb
 "
 
+pkg_setup(){
+	python_set_active_version 2
+	python_pkg_setup
+}
+
 src_configure() {
+#	${WAF_BINARY:="${S}/waf"}
 	if use debug
-		then econf --enable-debug=yes
-	else 
-		econf --enable-debug=no
+		then waf-utils_src_configure --project=mixer --enable-debug
+		else waf-utils_src_configure --project=mixer
 	fi
 }
 
 src_compile() {
-#make # builds everything else
-	cd ${S}/nonlib 
-	make -C nonlib
-	cd  ${S}/FL
-	make -C  FL
-	cd ${S}/mixer 
-	make -C  mixer
+	waf-utils_src_compile
 }
 
 src_install() {
-	cd ${S}/mixer
-	emake DESTDIR="${D}" install
+	waf-utils_src_install
 }
-