Revision bump, add gcc 4.1 patch submitted by Robert Marmorstein <rmmarm@wm.edu> (bug #128479). Fix up libdir references for multilib.

(Portage version: 2.1_pre7-r4)

6 files changed, 116 insertions, 6 deletions

diff --git a/media-sound/spiralmodular/ChangeLog b/media-sound/spiralmodular/ChangeLog
index 4426281e42f4..e38ac68a5081 100644
--- a/media-sound/spiralmodular/ChangeLog
+++ b/media-sound/spiralmodular/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/spiralmodular
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/spiralmodular/ChangeLog,v 1.13 2004/12/19 06:48:12 eradicator Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/spiralmodular/ChangeLog,v 1.14 2006/04/03 15:42:37 chutzpah Exp $
+
+*spiralmodular-0.2.2a-r1 (03 Apr 2006)
+
+  03 Apr 2006; Patrick McLean <chutzpah@gentoo.org>
+  +files/spiralmodular-0.2.2a-gcc41.patch, +spiralmodular-0.2.2a-r1.ebuild:
+  Revision bump, add gcc 4.1 patch submitted by Robert Marmorstein
+  <rmmarm@wm.edu> (bug #128479). Fix up libdir references for multilib.
 
   18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
   spiralmodular-0.2.2a.ebuild:
diff --git a/media-sound/spiralmodular/files/digest-spiralmodular-0.2.2a-r1 b/media-sound/spiralmodular/files/digest-spiralmodular-0.2.2a-r1
new file mode 100644
index 000000000000..e3f3d74c8a7e
--- /dev/null
+++ b/media-sound/spiralmodular/files/digest-spiralmodular-0.2.2a-r1
@@ -0,0 +1 @@
+MD5 e4f44908f72447995103009a2bbf3d56 spiralmodular-0.2.2a.tar.bz2 359923
diff --git a/media-sound/spiralmodular/files/spiralmodular-0.2.2a-gcc41.patch b/media-sound/spiralmodular/files/spiralmodular-0.2.2a-gcc41.patch
new file mode 100644
index 000000000000..ce0ad91a4cc6
--- /dev/null
+++ b/media-sound/spiralmodular/files/spiralmodular-0.2.2a-gcc41.patch
@@ -0,0 +1,39 @@
+diff -Naur spiralmodular-0.2.2.old/SpiralSound/Sample.h spiralmodular-0.2.2/SpiralSound/Sample.h
+--- spiralmodular-0.2.2.old/SpiralSound/Sample.h	2006-04-02 04:42:11.000000000 -0400
++++ spiralmodular-0.2.2/SpiralSound/Sample.h	2006-04-02 04:43:11.000000000 -0400
+@@ -68,7 +68,7 @@
+ 	void CropTo(int NewLength);
+ 	bool IsEmpty() const { return m_IsEmpty; }
+ 
+-	inline float &Sample::operator[](int i) const
++	inline float &operator[](int i) const
+ 	{
+ 		#ifdef DEBUG
+ 			assert(i>=0 && i<m_Length);
+@@ -77,7 +77,7 @@
+ 	}
+ 
+ 	// Linear interpolated
+-	inline float Sample::operator[](float i) const
++	inline float operator[](float i) const
+ 	{
+ 		int ii=(int)i;
+ 
+@@ -91,7 +91,7 @@
+ 	}
+ 
+ 
+-	inline void Sample::Set(int i, float v)
++	inline void Set(int i, float v)
+ 	{
+ 		m_IsEmpty=false;
+ 		#ifdef DEBUG
+@@ -100,7 +100,7 @@
+ 		m_Data[i]=v;
+ 	}
+ 
+-	inline Sample &Sample::operator=(const Sample &rhs)
++	inline Sample &operator=(const Sample &rhs)
+ 	{
+ 		Allocate(rhs.GetLength());
+ 		memcpy(m_Data,rhs.GetBuffer(),GetLengthInBytes());
diff --git a/media-sound/spiralmodular/spiralmodular-0.2.1.ebuild b/media-sound/spiralmodular/spiralmodular-0.2.1.ebuild
index ab55c3dc4cfa..33b7dba437a1 100644
--- a/media-sound/spiralmodular/spiralmodular-0.2.1.ebuild
+++ b/media-sound/spiralmodular/spiralmodular-0.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/spiralmodular/spiralmodular-0.2.1.ebuild,v 1.12 2005/07/09 19:11:30 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/spiralmodular/spiralmodular-0.2.1.ebuild,v 1.13 2006/04/03 15:42:37 chutzpah Exp $
 
 inherit eutils
 
diff --git a/media-sound/spiralmodular/spiralmodular-0.2.2a-r1.ebuild b/media-sound/spiralmodular/spiralmodular-0.2.2a-r1.ebuild
new file mode 100644
index 000000000000..bc3c6324fef1
--- /dev/null
+++ b/media-sound/spiralmodular/spiralmodular-0.2.2a-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/spiralmodular/spiralmodular-0.2.2a-r1.ebuild,v 1.1 2006/04/03 15:42:37 chutzpah Exp $
+
+inherit eutils multilib
+
+IUSE="alsa jack"
+
+DESCRIPTION="SSM is a object oriented modular softsynth/ sequencer/ sampler."
+HOMEPAGE="http://www.pawfal.org/Software/SSM/"
+SRC_URI="mirror://sourceforge/spiralmodular/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND=">=x11-libs/fltk-1.1
+	media-libs/libsndfile
+	media-libs/liblrdf
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	media-libs/ladspa-sdk"
+
+S=${WORKDIR}/${PN}-0.2.2
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}/${P}-gcc41.patch"
+}
+
+src_compile() {
+	for file in `find . -name Makefile.in`; do
+		sed -i s/CXXFLAGS=\\t@CXXFLAGS@/CXXFLAGS=\\t@CXXFLAGS@\ @FLTK_CXXFLAGS@/ $file
+		sed -i s/CFLAGS\\t=\\t@CFLAGS@/CFLAGS\\t=\\t@CFLAGS@\ @FLTK_CFLAGS@/ $file
+	done
+
+	# NOTE: We can't do use_enable for this package as it believe --enable-a and --disable-a both mean disable
+	local myconf;
+	if ! use jack; then
+		myconf="${myconf} --disable-jack"
+	fi
+
+	if ! use alsa; then
+		myconf="${myconf} --disable-alsa-midi"
+	fi
+
+	econf ${myconf} || die "configure failed"
+	emake || die
+}
+
+src_install() {
+	dodir /usr/bin /usr/$(get_libdir) /usr/share/man /usr/share/info
+	dodoc Examples/*
+	make bindir=${D}/usr/bin libdir=${D}/usr/$(get_libdir) mandir=${D}/usr/share/man infodir=${D}/usr/share/info datadir=${D}/usr/share install || die
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Remember to remove any old ~/.sprialmodular files"
+	einfo
+}
diff --git a/media-sound/spiralmodular/spiralmodular-0.2.2a.ebuild b/media-sound/spiralmodular/spiralmodular-0.2.2a.ebuild
index 8f0a3ef09947..7033159d5752 100644
--- a/media-sound/spiralmodular/spiralmodular-0.2.2a.ebuild
+++ b/media-sound/spiralmodular/spiralmodular-0.2.2a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/spiralmodular/spiralmodular-0.2.2a.ebuild,v 1.10 2005/07/09 19:11:30 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/spiralmodular/spiralmodular-0.2.2a.ebuild,v 1.11 2006/04/03 15:42:37 chutzpah Exp $
 
 inherit eutils