[proaudio] [1830] media-sound/ingen-9999 update, should build again for now

[subversion@xxxxxxxxxxxxx]

Revision: 1830
Author:   gavlee
Date:     2010-12-28 18:46:52 +0100 (Tue, 28 Dec 2010)
Log Message:
-----------
media-sound/ingen-9999 update, should build again for now

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/ingen/ChangeLog
    trunk/overlays/proaudio/media-sound/ingen/Manifest
    trunk/overlays/proaudio/media-sound/ingen/ingen-9999.ebuild
    trunk/overlays/proaudio/media-sound/ingen/metadata.xml

Modified: trunk/overlays/proaudio/media-sound/ingen/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/ingen/ChangeLog	2010-12-28 17:46:49 UTC (rev 1829)
+++ trunk/overlays/proaudio/media-sound/ingen/ChangeLog	2010-12-28 17:46:52 UTC (rev 1830)
@@ -2,6 +2,9 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Dec 2010; Gavin Pryke <gavinlee303@xxxxxxxxxxxxxx> ingen-9999.ebuild:
+  update. match use flags according to waf options.
+
   20 Jul 2010; Gavin Pryke <gavinlee303@xxxxxxxxxxxxxx> ingen-9999.ebuild,
   metadata.xml:
   Depend on jack explicitly without use flag, thanks to Alexandros Diamantidis

Modified: trunk/overlays/proaudio/media-sound/ingen/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/ingen/Manifest	2010-12-28 17:46:49 UTC (rev 1829)
+++ trunk/overlays/proaudio/media-sound/ingen/Manifest	2010-12-28 17:46:52 UTC (rev 1830)
@@ -1,3 +1,3 @@
-EBUILD ingen-9999.ebuild 1576 RMD160 48d9c3d5896df7fc0ddd89245836305c757403ed SHA1 29ef3a8f9cd2b1519756115cfcc6b4b746959b32 SHA256 17093bfb13981fbcf4967f7bd3edfecff1304f25965a7e536b1b786dc09b6207
-MISC ChangeLog 541 RMD160 5d8202f8baae77427afd9ddb970a8c3b9309b80d SHA1 ffa6f8010ef59e528ae0dd6d41a9783a3ed81b1a SHA256 08844057c7f43735792685f9a8fb49f5a7993efddc23b5d3598b5a115a63dd3f
-MISC metadata.xml 330 RMD160 7040bba3255133d0848c3313937e40945783f045 SHA1 a686a9d1b2f8bffaab54ab8429adfcfc2dd5fc4c SHA256 394ae6fd7a956ec8841ebfe80013fb88a91ef6f9970708fa393552c2cf491c72
+EBUILD ingen-9999.ebuild 1680 RMD160 d92f3f22f74b83ca9b4bed02ffe1647a52eb49d7 SHA1 60329dfde4a981211f41b98939fda95b208f56a8 SHA256 3bf0240bd9004a8c6a0989860ccb78fcb87f81430c5df13c8f73578c256be681
+MISC ChangeLog 669 RMD160 9f701c49f4e4362c13ecf04212ef1863b50c0161 SHA1 fd36cbd4dd35002bb4e87cdd69f3544934b42fd6 SHA256 e35f8bb872d19b6ffe3fb0fdc58c41d013ae3ae0c63805f48e39644cfef8b215
+MISC metadata.xml 355 RMD160 daf7ddda6967d5ee9ea63ae43f4cdc8524cac8e4 SHA1 6af244590e329b87269ff90a12f8e8240a8aa4ea SHA256 3932e328da6201b17a6293f270e41d9436af8c32da25f1f28869fb09c74ba117

Modified: trunk/overlays/proaudio/media-sound/ingen/ingen-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/ingen/ingen-9999.ebuild	2010-12-28 17:46:49 UTC (rev 1829)
+++ trunk/overlays/proaudio/media-sound/ingen/ingen-9999.ebuild	2010-12-28 17:46:52 UTC (rev 1830)
@@ -2,12 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit subversion exteutils autotools
+EAPI=2
+inherit subversion autotools toolchain-funcs multilib
 
-RESTRICT="mirror"
-# lash currently not supported upstream
-IUSE="midi ladspa osc gtk alsa lash"
-
 DESCRIPTION="Ingen is a modular synthesizer using the Jack audio server and LV2 or LADSPA plugins."
 HOMEPAGE="http://drobilla.net/software/ingen";
 
@@ -17,45 +14,50 @@
 LICENSE="GPL-2"
 KEYWORDS=""
 SLOT="0"
+IUSE="debug doc ladspa osc soup"
 
-RDEPEND="osc? ( >=media-libs/liblo-0.22 )
+RDEPEND=">=dev-cpp/libglademm-2.6.0
+	>=dev-libs/libxml2-2.6
+	>=dev-libs/redlandmm-9999
+	>=media-libs/alsa-lib-1.0.0
 	>=media-libs/raul-9999
-	>=dev-libs/redlandmm-9999
-	lash? ( >=media-sound/lash-0.5.0 )
-	midi? ( >=media-libs/alsa-lib-1.0.0 )
-	>=dev-libs/libxml2-2.6
-	>=dev-libs/glib-2.14.0
-	>=dev-cpp/glibmm-2.14.0
-	>=dev-libs/libsigc++-2.0
-	gtk? ( >=dev-cpp/gtkmm-2.11.12
-		>=dev-cpp/libgnomecanvasmm-2.6
-		>=dev-cpp/libglademm-2.6.0
-		>=net-libs/libsoup-2.4.0
-		>=x11-libs/flowcanvas-9999 )
+	>=media-libs/slv2-9999
+	>=media-sound/jack-audio-connection-kit-0.109.0
+	>=x11-libs/flowcanvas-9999
 	ladspa? ( media-libs/ladspa-sdk )
-	>=media-sound/jack-audio-connection-kit-0.109.0
-	>=media-libs/slv2-9999"
+	osc? ( >=media-libs/liblo-0.22 )
+	soup? ( >=net-libs/libsoup-2.4.0 )"
 
 DEPEND="${RDEPEND}
 	>=dev-libs/boost-1.33.1
 	dev-util/pkgconfig"
 
-src_compile() {
+src_prepare() {
+	# work around ldconfig call causing sandbox violation
+	sed -i -e "s/bld.add_post_fun(autowaf.run_ldconfig)//" ${PN}/wscript || die
+}
+
+src_configure() {
 	cd ${PN}
-
-	local myconf="--prefix=/usr --libdir=/usr/$(get_libdir)/"
-
-	use doc && myconf="${myconf} --build-docs --htmldir=/usr/share/doc/${P}/html"
-	use debug && myconf="${myconf} --debug"
-
-	./waf configure \
+	tc-export CC CXX CPP AR RANLIB
+	CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" \
+		./waf configure --prefix=/usr --libdir=/usr/$(get_libdir)/ \
 		--module-dir=/usr/$(get_libdir)/ingen \
-		${myconf} || die
+		$(! use ladspa && echo " --no-ladspa") \
+		$(! use osc && echo " --no-osc") \
+		$(! use soup && echo " --no-http") \
+		$(use debug && echo " --debug") \
+		$(use doc && echo " --docs --htmldir=/usr/share/doc/${P}/html") \
+		|| die "waf configure failed"
+}
 
-	./waf build ${MAKEOPTS} || die
+src_compile() {
+	cd ${PN}
+	./waf build || die
 }
+
 src_install() {
 	cd ${PN}
 	./waf install --destdir="${D}" || die "install failed"
-	dodoc AUTHORS README THANKS NEWS TODO ChangeLog
+	dodoc AUTHORS README THANKS
 }

Modified: trunk/overlays/proaudio/media-sound/ingen/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/ingen/metadata.xml	2010-12-28 17:46:49 UTC (rev 1829)
+++ trunk/overlays/proaudio/media-sound/ingen/metadata.xml	2010-12-28 17:46:52 UTC (rev 1830)
@@ -7,6 +7,6 @@
 		<name>pro-audio overlay team</name>
 	</maintainer>
 	<use>
-		<flag name="midi">Enable midi support</flag>
+		<flag name="soup">Enable support for HTTP via net-libs/libsoup</flag>
 	</use>
 </pkgmetadata>