[proaudio] [2324] non-sequencer: waf support from Tina Cochet with some cleanup

[subversion@xxxxxxxxxxxxx]

Revision: 2324
Author:   dominique
Date:     2012-11-18 20:16:28 +0100 (Sun, 18 Nov 2012)
Log Message:
-----------
non-sequencer: waf support from Tina Cochet with some cleanup

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

Modified: trunk/overlays/proaudio/media-sound/non-sequencer/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/non-sequencer/ChangeLog	2012-11-18 19:07:01 UTC (rev 2323)
+++ trunk/overlays/proaudio/media-sound/non-sequencer/ChangeLog	2012-11-18 19:16:28 UTC (rev 2324)
@@ -2,6 +2,9 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Nov 2012; Dominique Michel <dominique_free@xxxxxxxxxxxxxxx>
+  non-sequencer-9999.ebuild (Thanks to Tina Cochet): waf support
+
   04 Nov 2012; Dominique Michel <dominique_free@xxxxxxxxxxxxxxx>
   non-sequencer-9999.ebuild (Thanks to Tina Cochet):
   A lot of changes again.

Modified: trunk/overlays/proaudio/media-sound/non-sequencer/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/non-sequencer/Manifest	2012-11-18 19:07:01 UTC (rev 2323)
+++ trunk/overlays/proaudio/media-sound/non-sequencer/Manifest	2012-11-18 19:16:28 UTC (rev 2324)
@@ -1,5 +1,5 @@
 AUX 61browser 27 SHA256 17c63997a54a85e7412b854ea2405fb55336a50e37ff763bc235bd8eb275d3ef SHA512 8a98dfc431a4beec0a8f9f28dc8fe7a019837b5240e9f977fd064fdedbddcc4c8bd18b2c5a484f74abddabe2f78192181fa689c90d9b89888220d4314ed4277f WHIRLPOOL 2d3a4f631dc43ebf9aea0889d796ffaab086aac3f78e32d72190228ac5273dbc571538d80284623f8e397d697f42bacb84edbded4e04a2e502007e81ec3e6cbb
 AUX x-www-browser 381 SHA256 4ebaf78075b2d1c73e9289bddc2012209109739694a8e9c4ea85821e7febc373 SHA512 fb76f4664cad0c68abecddf37ddf9fa0bda05e3856bfc9965b04c1174be52e5742f9d360c1e5657323b57f4ddbf2952788ff9b1153b7455b516a9742ac0b9ca2 WHIRLPOOL 9c2a32e6fc8de9333f6bd71e9e2125026bd55afc446afb61ffa6f0ab3333f8c60921ebbff3d0614808f609b6a1f2b4e0d3f0143681293644fbbb8627d54a06c6
-EBUILD non-sequencer-9999.ebuild 1592 SHA256 bfbee0727d81918a6907e557a1d8d92e5904958d655d80ecee83185919c856ea SHA512 de1ab38262c189b359e4ef9dcb551dfd6d9688f3e4344a2ba5ddbf696ef6b2aae127e54da4f14e7b09619c59c013f027a2977449776dc4a0df742816d49bf72f WHIRLPOOL fead880c234674b961b2d418161d2730ca1b869c2d49197bc5add7c9dcd2882d8d6d783b812026e54e904aca932b0924334b431d58f85c5772abac02e5f0019c
-MISC ChangeLog 1097 SHA256 8313cd2d21635c8157deb0b6418e75735c246a59c824c63a1fad62101f4f7047 SHA512 a796a5a04113e70673a5b02f8e378517badf6ef32b70a4a242d1a2958cb0465b482408441e6399713f67ad9b791950a57d75136cfa8565d0f605e894d2323821 WHIRLPOOL 94ecfff320c2cd688bcc595c6868135cc22d5f862fbf17c3d3567b2ba7090234b66b0e050a7f1fd512f9a9903d1f868ba798cd214c5ec1fb92829ff4408167cb
+EBUILD non-sequencer-9999.ebuild 1084 SHA256 6ac8502a350316fbd4a3b6c041786f4eca43dc6dd91607872fe2d08a2c03e406 SHA512 97a58bc3bb065349b3ada73d4d23b23e49658d8e09afe65507d8622538d5164f4ebf92f1943558a21245905905458e926fca5ef6603660998fe9967b359d1a38 WHIRLPOOL 758662d0705a413088212fd199740461d273e6b2b9d5f0825c7e08c93f9622cf7691ced96ed4dd8b2d1351d4f3297b370a525c5076ee654a7b4ba4f90372aa25
+MISC ChangeLog 1228 SHA256 75a31274adc6e7888bd96d408a149093dce9edef51f9b235595c378b19936346 SHA512 cbd4a2f3484fc5d34a10fc9316ef45a469301fa42bd53f93a027bf4bb688011f0f57ce66d4f366442167c0937fdafcb03c8caa8418b7b09ed71efb1ab4ce1419 WHIRLPOOL af1ce27c5d8490124ae8638bbf217066eae1f29bccb3abdfe327f9548c2a535b9c8164d137a15140809579adb963cea934ad63ff292dd93c88c240fd1fb5185e
 MISC metadata.xml 268 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89 SHA512 3d709a016692f887d642d19b2644c10a09f666133f1f035b8a4c10e5772fbb39fa84a856a496d392594ccf850739fbf46ffa78ecc74214e8342ee97676b375e9 WHIRLPOOL 17c886c5b97925bd9223c0210170a63e55a2c2a238ae81ebf8efa14109d790406f45d0773d63bea825c1e40b058bd9e20a5d9c264da4db7c8fd2e556ecd83b2a

Modified: trunk/overlays/proaudio/media-sound/non-sequencer/non-sequencer-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/non-sequencer/non-sequencer-9999.ebuild	2012-11-18 19:07:01 UTC (rev 2323)
+++ trunk/overlays/proaudio/media-sound/non-sequencer/non-sequencer-9999.ebuild	2012-11-18 19:16:28 UTC (rev 2324)
@@ -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,50 +24,32 @@
 	"
 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() {
-	if use debug ; then
-		econf --enable-debug=yes
-	else
-		econf --enable-debug=no
+	if use debug
+		then waf-utils_src_configure --project=sequencer --enable-debug
+		else waf-utils_src_configure --prefix=/usr --project=sequencer
 	fi
 }
 
 src_compile() {
-#make # builds everything else
-	cd ${S}/nonlib 
-	make -C nonlib
-	cd  ${S}/FL
-	make -C  FL
-	cd ${S}/sequencer 
-	make -C  sequencer
+	waf-utils_src_compile
 }
 
 src_install() {
-	cd ${S}/sequencer
-	emake DESTDIR="${D}" install
-	
-	# necessary to launch Help -> Manual
-	dobin "${FILESDIR}/x-www-browser"
-	doenvd "${FILESDIR}/61browser"
+	waf-utils_src_install
 }
-
-pkg_postinst() {
-	ewarn "If it is the first time you install ${PN},"
-	ewarn "You should review the value of BROWSER in /etc/env.d/61browser"
-	ewarn ""
-	ewarn "If running X, the best is to log-out and re-login."
-	ewarn "As alternative, you can run in a terminal"
-	ewarn "  env-update && source /etc-profile"
-	ewarn "and run the Non Things from the same terminal."
-	ewarn "Otherwise, Help -> Manual will do nothing."
-}