[proaudio] [2325] non-session-manager: waf support by Tina Cochet; cleanup; added RDEPEND=medialibs/pyliblo to resolve a file collision

[subversion@xxxxxxxxxxxxx]

Revision: 2325
Author:   dominique
Date:     2012-11-18 21:04:28 +0100 (Sun, 18 Nov 2012)
Log Message:
-----------
non-session-manager: waf support by Tina Cochet; cleanup; added RDEPEND=medialibs/pyliblo to resolve a file collision

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

Modified: trunk/overlays/proaudio/media-sound/non-session-manager/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/non-session-manager/ChangeLog	2012-11-18 19:16:28 UTC (rev 2324)
+++ trunk/overlays/proaudio/media-sound/non-session-manager/ChangeLog	2012-11-18 20:04:28 UTC (rev 2325)
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Nov 2012; Dominique Michel <dominique@xxxxxxxxxxxxx>
+  non-session-manager-9999.ebuild: waf support from Tina Cochet; clean-up;
+  added RDEPEND=media-libs/pyliblo to resolve a file collision
+
   04 Nov 2012; Dominique Michel <dominique@xxxxxxxxxxxxx>
   +non-session-manager-9999.ebuild:
   From Tina Cochet's ebuild with a little clean-up

Modified: trunk/overlays/proaudio/media-sound/non-session-manager/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/non-session-manager/Manifest	2012-11-18 19:16:28 UTC (rev 2324)
+++ trunk/overlays/proaudio/media-sound/non-session-manager/Manifest	2012-11-18 20:04:28 UTC (rev 2325)
@@ -1,3 +1,3 @@
-EBUILD non-session-manager-9999.ebuild 1053 SHA256 c44dba90abb2e4d686c84f91e7c4daadad5866a5d0084859889c0a41facde1dd SHA512 671c2c50bb278ceacdffd7df441c9524fe7923abbdba6dfce0f417b7f88d83adccde9993fbd257d228b5080a125854ccbe58d4ac28393c51fa497ba401d66105 WHIRLPOOL 18eb219996302691ac84132a21edd61f4f959a387cd81a60300ae95b06e58c07c11fd749e3dd7f1e01f023507034221d18f7ce3babfbdb1416d2b0b169919944
-MISC ChangeLog 277 SHA256 a3de748c8ce648325f8c35881cc9b1fecb76e5d6ae9063b48654ec30731f61ea SHA512 38b3cf4615e37d238ee6335baec2ad74919b5282cab46aa4fd6f3e323f23c6e5b6e07dfc4f0e9ddb396f6eff980781bc2ed5b18ddd315313f9ee2af9f4c59e2a WHIRLPOOL 7529efbd9f6abfd1a27b0e223a6f3e69e6e7ea709cb7d864394923c0fd6c3f4c679966ac699bddef2d7f204e3d2ae6faa791bfd454e6a2414fd71f9e208572c1
+EBUILD non-session-manager-9999.ebuild 1223 SHA256 b42bae8ec5eb8a3d92c6de7936ec0f9aa0261c9cf0aae90a16c39f0f3857a2cc SHA512 9614d8bf3e9e5371c1fa58c67c52761013f468e18530e37673a340f58595eb9a6c782200cc1dc46dfec7bdf2b7eb6c7986f90dd44b15e4202fe47690f42938f1 WHIRLPOOL 6d8b2cadac2358454bfab3f1fbf9466ee0f2c439a39a65a7f33b3cdaeaa014f734dcc56efe973eae4c3c5f140894498efa889a68d8d3c510384bc8ff1a9189a6
+MISC ChangeLog 474 SHA256 f63df1549852180f749ce35f06b23fa526ec4ce0a55f26f334a023b106289a2e SHA512 f2fda4f9f466cfe6d99353e59d8394f75e0031d17e14e0afdf577b55b5c42db2c4004d6c8d66685f3e8d5fc842fb309242b4a7732fba8f833b322ddf0c288b86 WHIRLPOOL d69dfd9684d5b77bbe65d193347baf8102e87b39dafd117f58b0705e1082be86a22ea558d2da02f213f4e7e29e37966c1ebcc8f9200b9c77e88a8537b7be10c5
 MISC metadata.xml 268 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89 SHA512 3d709a016692f887d642d19b2644c10a09f666133f1f035b8a4c10e5772fbb39fa84a856a496d392594ccf850739fbf46ffa78ecc74214e8342ee97676b375e9 WHIRLPOOL 17c886c5b97925bd9223c0210170a63e55a2c2a238ae81ebf8efa14109d790406f45d0773d63bea825c1e40b058bd9e20a5d9c264da4db7c8fd2e556ecd83b2a

Modified: trunk/overlays/proaudio/media-sound/non-session-manager/non-session-manager-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/non-session-manager/non-session-manager-9999.ebuild	2012-11-18 19:16:28 UTC (rev 2324)
+++ trunk/overlays/proaudio/media-sound/non-session-manager/non-session-manager-9999.ebuild	2012-11-18 20:04:28 UTC (rev 2325)
@@ -4,52 +4,55 @@
 
 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=""
-IUSE="-debug"
+IUSE="-debug "
 
-RDEPEND="x11-libs/ntk
-	>=media-sound/jack-audio-connection-kit-0.103.0
+RDEPEND=">=media-sound/jack-audio-connection-kit-0.103.0
 	>=media-libs/liblrdf-0.1.0
 	>=media-libs/liblo-0.26
 	>=dev-libs/libsigc++-2.2.0
-	"
+	media-sound/non-session-manager
+	media-libs/pyliblo"
 DEPEND="${RDEPEND}
-	x11-libs/cairo 
-	x11-libs/libXft 
-	media-libs/libpng 
-	x11-libs/pixman 
-	x11-libs/libXpm 
-	virtual/jpeg 
+	x11-libs/ntk
+	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=session-manager --enable-debug
+		else waf-utils_src_configure --project=session-manager
 	fi
 }
 
 src_compile() {
-#make # builds everything else
-	cd ${S}/nonlib 
-	make -C nonlib
-	cd  ${S}/FL
-	make -C  FL
-	cd ${S}/session-manager 
-	make -C  session-manager
+	waf-utils_src_compile
 }
 
 src_install() {
-	cd ${S}/session-manager 
-	emake DESTDIR="${D}" install
+	waf-utils_src_install
+
+	# strange, doesn't work in pkg_preinst... who konws?
+	# provided by media-libs/pyliblo
+	rm "${D}/usr/bin/send_osc" || die
 }