[proaudio] [1857] media-plugins/calf multilib-strict fixes, workaround sandbox violation

[subversion@xxxxxxxxxxxxx]

Revision: 1857
Author:   gavlee
Date:     2011-01-26 13:12:40 +0100 (Wed, 26 Jan 2011)
Log Message:
-----------
media-plugins/calf multilib-strict fixes, workaround sandbox violation
thanks to Matt Henley

Modified Paths:
--------------
    trunk/overlays/proaudio/media-plugins/calf/ChangeLog
    trunk/overlays/proaudio/media-plugins/calf/Manifest
    trunk/overlays/proaudio/media-plugins/calf/calf-9999.ebuild

Added Paths:
-----------
    trunk/overlays/proaudio/media-plugins/calf/calf-0.0.18.6-r1.ebuild

Modified: trunk/overlays/proaudio/media-plugins/calf/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-plugins/calf/ChangeLog	2011-01-25 19:40:59 UTC (rev 1856)
+++ trunk/overlays/proaudio/media-plugins/calf/ChangeLog	2011-01-26 12:12:40 UTC (rev 1857)
@@ -1,7 +1,14 @@
 # ChangeLog for media-plugins/calf
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*calf-0.0.18.6-r1 (26 Jan 2011)
+
+  26 Jan 2011; Gavin Pryke <gavinlee303@xxxxxxxxxxxxxx>
+  +calf-0.0.18.6-r1.ebuild, calf-9999.ebuild:
+  add multilib-strict fixes for amd64 and update live ebuild to work around
+  sandbox violation.
+
 *calf-0.0.18.6 (28 Aug 2010)
 
   28 Aug 2010; Viktor Lazarev <taurus101v@xxxxxxxxx> +calf-0.0.18.6.ebuild:

Modified: trunk/overlays/proaudio/media-plugins/calf/Manifest
===================================================================
--- trunk/overlays/proaudio/media-plugins/calf/Manifest	2011-01-25 19:40:59 UTC (rev 1856)
+++ trunk/overlays/proaudio/media-plugins/calf/Manifest	2011-01-26 12:12:40 UTC (rev 1857)
@@ -4,7 +4,8 @@
 DIST calf-0.0.18.6.tar.gz 599207 RMD160 d9e91646f2c2caa0788d6553d387be6c74dae732 SHA1 304585f5c99135914995efefc585fe7befee0985 SHA256 304733efbafc00c94807a0f8d5a56125893769231db48f8d6a889b9ca794860f
 EBUILD calf-0.0.17.ebuild 820 RMD160 bcd68054a05ea5eba71a4f77080247285763b4c9 SHA1 034a8e6be593e02ef0ba802c8312b7058f6aae74 SHA256 06f649e42937c767cdba68d70087ac5c5d2dc7687cc22f02590c4a3f335a9102
 EBUILD calf-0.0.18.5.ebuild 1038 RMD160 fb5d1c2b377181b70b1ee86ff141603b9b57abfd SHA1 6c48217c9c1b10bbdd23e2d3e468345f4a342ad9 SHA256 3660695512653b5fd3b9503631a7c0399ce4296e5418f7859ddd7e380bf66f19
+EBUILD calf-0.0.18.6-r1.ebuild 1226 RMD160 d4a3a875414b4c62762a09c4a853589df5f4e6e5 SHA1 902159361b79738e00b396b3b66b02ab0233c40e SHA256 93727354647e41d8feb048a72b8b736a0c1fa691f757538972c9d26059a28137
 EBUILD calf-0.0.18.6.ebuild 989 RMD160 c8d47e0eec0749f2a1afa33d8df72a2ed8cff8e2 SHA1 8c4fd92aca50b27467f10af8c4368dfd3c0f9a34 SHA256 8bb162c3feb31c718cd27e1707913444a8e1dff6ce8a4d0c508e9529c0e2c184
-EBUILD calf-9999.ebuild 958 RMD160 47fb219d80907c5fbad9de4d2177325c4811e28f SHA1 13df207f0af6a4978e5eb9909fd86a25d5ebe440 SHA256 cf92dea7e1e576c17cd115970ab720dcee3fa676b1b3155da9865794338d286f
-MISC ChangeLog 963 RMD160 c008ca2b5cbc6e7bf97dd6890114b8a5022c0567 SHA1 85b3e3245c9683643d1eec306eeae2ce4492cd18 SHA256 7afcd6570c069d89b8417e2af43b76b2b4cf1fcd3a52a8b4f9a14780022d82e6
+EBUILD calf-9999.ebuild 1374 RMD160 e5f833e8a33de825cb15dd642bfab4a9a1c4f0c8 SHA1 542008d93dc355aa92bff1675f2f76159011a7a2 SHA256 f6234673512dae438c786ed10fd7066105036e6c9a0c15c74d15d1cb1c39b9a6
+MISC ChangeLog 1196 RMD160 ec4c488369355fb38ddf7327b32154dc0b6fe566 SHA1 399121996a061370c56659d87e64fe25f74cdc7d SHA256 838316ea7c8efab9eab839e380be6a35bade44ceceeccfe0cb28a6ce5e0d68e7
 MISC metadata.xml 335 RMD160 f838118e0ed9f3b40ee86d1f30bcdd495cbc9447 SHA1 98f3d8be2f38b2332fc81639c17c0fd994ec58ba SHA256 093de1a8fe562e034e480fc2f43b6e1d8c89895eab0fa591db9cd1bd257329b4

Added: trunk/overlays/proaudio/media-plugins/calf/calf-0.0.18.6-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-plugins/calf/calf-0.0.18.6-r1.ebuild	                        (rev 0)
+++ trunk/overlays/proaudio/media-plugins/calf/calf-0.0.18.6-r1.ebuild	2011-01-26 12:12:40 UTC (rev 1857)
@@ -0,0 +1,51 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit base multilib
+
+DESCRIPTION="Calf is a set of open source instruments and effects for digital audio workstations"
+HOMEPAGE="http://calf.sf.net/";
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug dssi +jack +lash +lv2 -ladspa"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/expat
+	x11-libs/gtk+:2
+	gnome-base/libglade:2.0
+	dssi? ( media-libs/dssi )
+	lash? ( media-sound/lash )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lv2? ( media-libs/lv2core )
+	ladspa? ( media-libs/ladspa-sdk )"
+DEPEND="${DEPEND}"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_prepare() {
+	# CXXFLAGS contains -O3
+	sed -i -e "s/-O3//" configure || die
+}
+
+src_configure() {
+	econf --with-ladspa-dir="/usr/$(get_libdir)/ladspa" \
+		--with-dssi-dir="/usr/$(get_libdir)/dssi" \
+		--with-lv2-dir="/usr/$(get_libdir)/lv2" \
+		$(use_enable debug) \
+		$(use_with ladspa) \
+		$(use_with lv2) \
+		|| die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	# workaround sandbox violation
+	rm -f "${D}/usr/share/icons/hicolor/icon-theme.cache"
+}

Modified: trunk/overlays/proaudio/media-plugins/calf/calf-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-plugins/calf/calf-9999.ebuild	2011-01-25 19:40:59 UTC (rev 1856)
+++ trunk/overlays/proaudio/media-plugins/calf/calf-9999.ebuild	2011-01-26 12:12:40 UTC (rev 1857)
@@ -1,14 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="1"
+EAPI="2"
 
-inherit git
+inherit base git multilib autotools
 
 DESCRIPTION="Calf is a set of open source instruments and effects for digital audio workstations"
 HOMEPAGE="http://calf.sf.net/";
-
 EGIT_REPO_URI="git://repo.or.cz/calf.git"
 
 LICENSE="LGPL-2.1"
@@ -16,28 +15,40 @@
 KEYWORDS=""
 IUSE="debug dssi +jack +lash +lv2 -ladspa"
 
-DEPEND=">=dev-libs/glib-2.10
-	>=x11-libs/gtk+-2.12
+RDEPEND="dev-libs/glib:2
+	dev-libs/expat
+	x11-libs/gtk+:2
+	gnome-base/libglade:2.0
 	dssi? ( media-libs/dssi )
 	lash? ( media-sound/lash )
 	jack? ( media-sound/jack-audio-connection-kit )
 	lv2? ( media-libs/lv2core )
 	ladspa? ( media-libs/ladspa-sdk )"
-RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
-src_compile() {
+src_prepare() {
+	# CXXFLAGS contains -O3
+	sed -i -e "s/-O3//" configure.ac || die
+}
+
+src_configure() {
 	NOCONFIGURE=1 ./autogen.sh
-	econf \
-	$(use_enable debug) \
-	$(use_with ladspa) \
-	$(use_with lv2) \
-	|| die
-	emake || die
+	econf --with-ladspa-dir="/usr/$(get_libdir)/ladspa" \
+		--with-dssi-dir="/usr/$(get_libdir)/dssi" \
+		--with-lv2-dir="/usr/$(get_libdir)/lv2" \
+		$(use_enable debug) \
+		$(use_with ladspa) \
+		$(use_with lv2) \
+		|| die
 }
 
 src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
-	rm -f "${D}/usr/share/icons/hicolor/icon-theme.cache"
+	# work around sandbox violation of
+	# /etc/gconf/gconf.xml.defaults/.testing.writeability due to gconf makefile
+	# schema install
+	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
+	make DESTDIR="${D}" install || die
+	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 }