Revision: 1712
Author:   gavlee
Date:     2010-08-04 16:38:59 +0200 (Wed, 04 Aug 2010)
Log Message:
-----------
media-sound/machina-9999 update

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

Modified: trunk/overlays/proaudio/media-sound/machina/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/machina/ChangeLog       2010-08-04 
10:04:51 UTC (rev 1711)
+++ trunk/overlays/proaudio/media-sound/machina/ChangeLog       2010-08-04 
14:38:59 UTC (rev 1712)
@@ -1,7 +1,10 @@
 # ChangeLog for media-sound/machina
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Aug 2010; Gavin Pryke <[email protected]> machina-9999.ebuild:
+  Update to fix build. deps may need looking at but does build for me now.
+
   16 Dec 2007; Thomas Kuther <[email protected]> machina-9999.ebuild:
   added SLOT
 

Modified: trunk/overlays/proaudio/media-sound/machina/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/machina/Manifest        2010-08-04 
10:04:51 UTC (rev 1711)
+++ trunk/overlays/proaudio/media-sound/machina/Manifest        2010-08-04 
14:38:59 UTC (rev 1712)
@@ -1,3 +1,3 @@
-EBUILD machina-9999.ebuild 2926 RMD160 
c605a5a4d432e9b456a64c2f503a0c425113ac45 SHA1 
c2b45f6704f23f606954d4da8144d84f2fc4e947 SHA256 
4b3b488ede9855a245386f9dc8bca8e6d35831373a6798a0b18fdac517f8853e
-MISC ChangeLog 210 RMD160 9104d7d9e2180da5d761ebd5a3fac6f483f86e1f SHA1 
5c02cd5b3c3df0dcb156a05184f33cf9d4abc8c4 SHA256 
9d5a3dc8bfd33b080570396e69476890c32f020e7d2bd844f25d5e67687d895a
+EBUILD machina-9999.ebuild 950 RMD160 aa19c96d5fe82fee58c395c3b55255cb852efc38 
SHA1 a37de3bf74e9029c28006e95f9075af2ada3a9b1 SHA256 
dca6b0ac2cb5d4d7c2f90827b9321fcc8a6ce56fe6416c41250e5a7197a2d611
+MISC ChangeLog 363 RMD160 6cca28fcde8a5eda136b53c1a705250512ce1e79 SHA1 
88b2fbbc752113729b28d39d4d5529cc0ad9e271 SHA256 
2bf7500b68fd6442d3b9960218b55c51d89b904fc7010f1d519acca8c71985a8
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 
2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 
96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Modified: trunk/overlays/proaudio/media-sound/machina/machina-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/machina/machina-9999.ebuild     
2010-08-04 10:04:51 UTC (rev 1711)
+++ trunk/overlays/proaudio/media-sound/machina/machina-9999.ebuild     
2010-08-04 14:38:59 UTC (rev 1712)
@@ -1,15 +1,14 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit subversion exteutils autotools
+inherit subversion toolchain-funcs multilib
 
 RESTRICT="mirror"
-IUSE=""
-#IUSE="dssi pic jackmidi midi ladspa lv2 jack osc gtk2 alsa lash in-process"
+IUSE="debug"
 
-DESCRIPTION="A MIDI sequencer based on probabilistic finite-state automata"
-HOMEPAGE="http://drobilla.net/software";
+DESCRIPTION="A polyphonic MIDI sequencer based on probabilistic finite-state 
automata"
+HOMEPAGE="http://drobilla.net/software/machina/";
 
 ESVN_REPO_URI="http://svn.drobilla.net/lad/trunk";
 ESVN_PROJECT="svn.drobilla.net"
@@ -18,87 +17,23 @@
 KEYWORDS=""
 SLOT="0"
 
-RDEPEND=">=media-libs/liblo-0.22
-       >=media-libs/raul-9999
-       >=media-sound/lash-0.5.0
-       >=media-sound/jack-audio-connection-kit-0.102.20
-       >=dev-libs/redland-1.0.6
-       ( >=dev-libs/libxml2-2.6
-               >=dev-cpp/glibmm-2.4
-               >=media-libs/raptor-0.21
-               >=dev-libs/rasqal-0.9.11
-               >=dev-libs/libsigc++-2.0 )
-        >=dev-cpp/gtkmm-2.4
-       >=dev-cpp/libgnomecanvasmm-2.6
-       >=dev-cpp/libglademm-2.4
-       >=x11-libs/flowcanvas-9999
-       >=media-sound/jack-audio-connection-kit-0.107.0"
+RDEPEND="=dev-libs/redlandmm-9999
+       =media-libs/raul-9999
+       =x11-libs/flowcanvas-9999
+       >=media-sound/jack-audio-connection-kit-0.109.0"
 
-DEPEND="${RDEPEND}
-       >=dev-libs/boost-1.33.1
-       dev-util/pkgconfig"
-
-pkg_setup() {
-       ewarn "if the compilation fails you can try to re-emerge"
-       ewarn "x11-libs/flowcanvas-9999 and media-libs/raul-9999"
-       ewarn "as ingen depens atm. on their latest code"
-       sleep 3s
-       if ! built_with_use media-libs/raul osc ; then
-           echo
-               eerror "this app need rauls osc support"
-               eerror "re-emerge media-libs/raul with useflag osc"
-               eerror "and then try this one again"
-               die
-       fi
-}
-src_unpack() {
-       subversion_src_unpack
-       cd "${S}"
-       #sed -i -e 's...@\(^ingen_load_LDADD.*\)@\1 -lras...@g' \
-       #       src/progs/patch_loader/Makefile.*
-       ####epatch ${FILESDIR}/ingen-no-lv2.patch
-       esed_check -i \
-               -e  "s...@\(^RAUL_CFLAGS\)....@\1=\"`pkg-config --cflags 
raul`\"@g" \
-               -e  "s...@\(^RAUL_LIBS\)....@\1=\"`pkg-config --libs raul`\"@g" 
\
-               configure.ac
-       esed_check -i \
-               -e  "s...@\(^FLOWCANVAS_CFLAGS\)....@\1=\"`pkg-config --cflags 
flowcanvas`\"@g" \
-               -e  "s...@\(^FLOWCANVAS_LIBS\)....@\1=\"`pkg-config --libs 
flowcanvas`\"@g" \
-               configure.ac
-       esed_check -i \
-               -e  "s...@\(^SLV2_CFLAGS\)....@\1=\"`pkg-config --cflags 
libslv2`\"@g" \
-               -e  "s...@\(^SLV2_LIBS\)....@\1=\"`pkg-config --libs 
libslv2`\"@g" \
-               configure.ac
-}
-
 src_compile() {
-       export WANT_AUTOCONF=2.6
-       export WANT_AUTOMAKE=1.10
-       #eautoreconf
-       NOCONFIGURE=1 ./autogen.sh
+       cd ${PN}
+       tc-export CC CXX CPP AR RANLIB
+       ./waf configure --prefix=/usr \
+               --libdir=/usr/$(get_libdir)/ \
+               $(use debug && echo "--debug") || die "waf configure failed"
 
-       JACK_CFLAGS=`pkg-config --cflags jack` \
-       JACK_LIBS=`pkg-config --libs jack` \
-       ALSA_CFLAGS=`pkg-config --cflags alsa` \
-       ALSA_LIBS=`pkg-config --libs alsa` \
-       econf \
-               --disable-in-process-engine \
-               --without-pic \
-               --disable-dssi \
-               --disable-lash \
-               --disable-ladspa \
-               --disable-server \
-               --disable-ingen-gtk-client \
-               --disable-jack \
-               --disable-alsa \
-               --disable-lv2 \
-               --enable-machina-gui || die "configure failed"
-       cd "${S}/${PN}" || die "source for ${PN} not found"
-       emake || die "make failed"
+       ./waf build ${MAKEOPTS} || die "waf build failed"
 }
 
 src_install() {
-       cd "${S}/${PN}" || die "source for ${PN} not found"
-       make DESTDIR="${D}" install || die "install failed"
-       dodoc AUTHORS README THANKS NEWS TODO ChangeLog
+       cd ${PN}
+       ./waf install --destdir="${D}" || die "waf install failed"
+       dodoc AUTHORS README THANKS
 }

Reply via email to