[proaudio] [2322] non-daw: waf support by Tina Cochet with some cleanup

[subversion@xxxxxxxxxxxxx]

Revision: 2322
Author:   dominique
Date:     2012-11-18 19:53:52 +0100 (Sun, 18 Nov 2012)
Log Message:
-----------
non-daw: waf support by Tina Cochet with some cleanup

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

Modified: trunk/overlays/proaudio/media-sound/non-daw/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/non-daw/ChangeLog	2012-11-18 18:18:40 UTC (rev 2321)
+++ trunk/overlays/proaudio/media-sound/non-daw/ChangeLog	2012-11-18 18:53:52 UTC (rev 2322)
@@ -3,6 +3,9 @@
 # $Header: $
 
   04 Nov 2012; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>
+  non-daw-9999.ebuild: waf support from Tina Cochet with a few cleanup
+
+  04 Nov 2012; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>
   +non-daw-9999.ebuild:
   From Tina Cochet ebuild with a few clean-up and the addition of
   the installation of 2 missing files.

Modified: trunk/overlays/proaudio/media-sound/non-daw/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/non-daw/Manifest	2012-11-18 18:18:40 UTC (rev 2321)
+++ trunk/overlays/proaudio/media-sound/non-daw/Manifest	2012-11-18 18:53:52 UTC (rev 2322)
@@ -1,3 +1,3 @@
-EBUILD non-daw-9999.ebuild 1165 SHA256 a1213ad46ca1e0bf8b64f8134bfc626691b99b153bc52accb4ea7484e3c817ed SHA512 7a85ad280f239447462f40f597b20661647250bcc621bb4f1c53e2ef384f2957d2ca4ec496faad0d48b9ba5ae6864dbe9149696560346a8c742941e42ea76d79 WHIRLPOOL 73ffb845906c85f0801bf76f49cb3aff9c5de9796ebb59e0301645106cc9da3e1e24b1f546ce0bc409cb4753d383ac02c41d8afc78b6c576a91f88d8e40c1cb1
-MISC ChangeLog 315 SHA256 e22ba3b1d355f6d5050bbae9e82e46462b41204329850f78813ee663d0df8326 SHA512 afd57e2c576dfadc84f269bf5fa8f2901adef360b257dc565455576e9de740963db8b4eec4cedbae59e4dc50a705471c25ee46c5c22ffc443ed2b76623abdbeb WHIRLPOOL 5d792bce2276dc0359cf92ddb927a895cc893aa9704438262da73ff7fdd676535daef09d55e21748a60332a6e0ea74de813015322c594e124c86ec8988ed6ff2
+EBUILD non-daw-9999.ebuild 1229 SHA256 09b585e6dce51aad87ffc56d2ea50183ac9367f76414eb63b8e5a018469bb55b SHA512 94c316f9fa9ea99ecb747f836f4376e9eb2d4ab7c6b61027e65bb240d1e640ccccc83cfebbc6e30d029a82dd2533b3a0306f72b4fb54cdebd8058acfe8173109 WHIRLPOOL 11a2fb434258a99d9e0f6e95b5bf48182f56dc41b951a46a7bbcba55293ac93a839ba537f25c5de96448b6f982d18aa73b99bb3f2c00710cae3db3af66cd6137
+MISC ChangeLog 453 SHA256 6fcdba5f87c34c91b5cfc85b9b8275877068ee0bea6fff5d92fb2fcc6c5aa990 SHA512 76981a28523aac6866dc075d45e31298a589e64dbc68fdfd1f3958120d8a4ae7b302679fbfd0a65c94fe479c225c481767d66e4be4333257f039376d1906f500 WHIRLPOOL 184341da3bc37273eaa8a1713894370997152fa3e5a4936eb5693ae36174b05875f3276dda2f1e8405d03703fcb92f29668c72e76a4971433fc36145cf94e673
 MISC metadata.xml 268 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89 SHA512 3d709a016692f887d642d19b2644c10a09f666133f1f035b8a4c10e5772fbb39fa84a856a496d392594ccf850739fbf46ffa78ecc74214e8342ee97676b375e9 WHIRLPOOL 17c886c5b97925bd9223c0210170a63e55a2c2a238ae81ebf8efa14109d790406f45d0773d63bea825c1e40b058bd9e20a5d9c264da4db7c8fd2e556ecd83b2a

Modified: trunk/overlays/proaudio/media-sound/non-daw/non-daw-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/non-daw/non-daw-9999.ebuild	2012-11-18 18:18:40 UTC (rev 2321)
+++ trunk/overlays/proaudio/media-sound/non-daw/non-daw-9999.ebuild	2012-11-18 18:53:52 UTC (rev 2322)
@@ -4,15 +4,17 @@
 
 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"
+#EGIT_BRANCH="waf"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="-debug"
+IUSE="-debug "
 
 RDEPEND=">=media-sound/jack-audio-connection-kit-0.103.0
 	>=media-libs/liblrdf-0.1.0
@@ -21,38 +23,35 @@
 	media-sound/non-session-manager
 	"
 DEPEND="${RDEPEND}
-	x11-libs/ntk
-	x11-libs/cairo 
-	x11-libs/libXft 
-	media-libs/libpng 
-	x11-libs/pixman 
-	x11-libs/libXpm 
-	virtual/jpeg 
+	>=x11-libs/ntk-1.3.0
+	x11-libs/cairo
+	x11-libs/libXft
+	media-libs/libpng
+	x11-libs/pixman
+	>=x11-libs/libXpm-2.0.0
+	virtual/jpeg
 	x11-libs/libXinerama
-	x11-libs/libxcb 
+	x11-libs/libxcb
 "
+pkg_setup(){
+	python_set_active_version 2
+	python_pkg_setup
+}
 
 src_configure() {
-	if use debug ; then
-		econf --enable-debug=yes
-	else
-		econf --enable-debug=no
+#	${WAF_BINARY:="${S}/waf"}
+	if use debug
+		then waf-utils_src_configure --project=timeline --enable-debug
+		else waf-utils_src_configure --project=timeline
 	fi
 }
 
 src_compile() {
-#make # builds everything else
-	cd ${S}/nonlib 
-	make -C nonlib
-	cd  ${S}/FL
-	make -C  FL
-	cd ${S}/timeline 
-	make -C  timeline
+	waf-utils_src_compile
 }
 
 src_install() {
-	 cd ${S}/timeline 
-	emake DESTDIR="${D}" install
+	waf-utils_src_install
 	dobin "${S}/timeline/bin/import-external-sources"
 	dobin "${S}/timeline/bin/remove-unused-sources"
 }