Version bump.

5 files changed, 79 insertions, 13 deletions

diff --git a/media-sound/spiralmodular/ChangeLog b/media-sound/spiralmodular/ChangeLog
index 464f9583adea..b5a1ff053ac5 100644
--- a/media-sound/spiralmodular/ChangeLog
+++ b/media-sound/spiralmodular/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/spiralmodular
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/spiralmodular/ChangeLog,v 1.3 2004/03/01 05:37:16 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/spiralmodular/ChangeLog,v 1.4 2004/03/21 03:49:50 eradicator Exp $
+
+*spiralmodular-0.2.2a (20 Mar 2004)
+
+  20 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  spiralmodular-0.2.1.ebuild, spiralmodular-0.2.2a.ebuild:
+  Version bump.
 
   28 Oct 2003; Martin Holzer <mholzer@gentoo.org> spiralmodular-0.2.1.ebuild,
   files/spiralmodular-0.2.1-gentoo.patch:
diff --git a/media-sound/spiralmodular/Manifest b/media-sound/spiralmodular/Manifest
index a81e35b1f4d7..173e1322413a 100644
--- a/media-sound/spiralmodular/Manifest
+++ b/media-sound/spiralmodular/Manifest
@@ -1,5 +1,7 @@
-MD5 bc000e5ad5b48879aec886af94486cc2 ChangeLog 548
-MD5 78a94a2c838dd0fa4a26b7d5d069fc45 spiralmodular-0.2.1.ebuild 1390
+MD5 6e578f5563b5bdb25f9070fd7a5aa68b spiralmodular-0.2.1.ebuild 1312
+MD5 e156e9f0f6a2bd8e5888bddd929fac3f spiralmodular-0.2.2a.ebuild 1313
+MD5 8ceb598b9d97b7f65b992c19d8c62587 ChangeLog 551
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 f4e4b9a9232b868cf049bf9ae2c36535 files/digest-spiralmodular-0.2.1 71
 MD5 88633a86b03d3e371fe880f098abee3f files/spiralmodular-0.2.1-gentoo.patch 962
+MD5 591854fbf03f041310ebc2752dcc6c9f files/digest-spiralmodular-0.2.2a 73
diff --git a/media-sound/spiralmodular/files/digest-spiralmodular-0.2.2a b/media-sound/spiralmodular/files/digest-spiralmodular-0.2.2a
new file mode 100644
index 000000000000..e3f3d74c8a7e
--- /dev/null
+++ b/media-sound/spiralmodular/files/digest-spiralmodular-0.2.2a
@@ -0,0 +1 @@
+MD5 e4f44908f72447995103009a2bbf3d56 spiralmodular-0.2.2a.tar.bz2 359923
diff --git a/media-sound/spiralmodular/spiralmodular-0.2.1.ebuild b/media-sound/spiralmodular/spiralmodular-0.2.1.ebuild
index c8610da4ca86..c3871cee09c2 100644
--- a/media-sound/spiralmodular/spiralmodular-0.2.1.ebuild
+++ b/media-sound/spiralmodular/spiralmodular-0.2.1.ebuild
@@ -1,6 +1,10 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.7 2004/03/01 05:37:16 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/spiralmodular/spiralmodular-0.2.1.ebuild,v 1.8 2004/03/21 03:49:50 eradicator Exp $
+
+inherit eutils
+
+IUSE="jack"
 
 DESCRIPTION="SSM is a object oriented modular softsynth/ sequencer/ sampler."
 HOMEPAGE="http://www.pawfal.org/Software/SSM/"
@@ -10,8 +14,6 @@ RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
-RDEPEND=">=x11-libs/fltk-1.1 \
-	media-libs/ladspa-sdk"
 
 DEPEND=">=x11-libs/fltk-1.1 \
 	virtual/jack \
@@ -25,14 +27,12 @@ src_unpack() {
 
 src_compile() {
 
-	for i in `find . -name Makefile.in`
-	do 	cat $i|sed s/CXXFLAGS=\\t@CXXFLAGS@/CXXFLAGS=\\t@CXXFLAGS@\ @FLTK_CXXFLAGS@/ |sed s/CFLAGS\\t=\\t@CFLAGS@/CFLAGS\\t=\\t@CFLAGS@\ @FLTK_CFLAGS@/ > $i.new
-		mv $i $i.old
-		mv $i.new $i
-		rm $i.old
+	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
-	myconf="--enable-shared  --enable-jack"
-	econf ${myconf} || die "configure failed"
+
+	econf --enable-shared --enable-jack || die "configure failed"
 	emake || die
 }
 
diff --git a/media-sound/spiralmodular/spiralmodular-0.2.2a.ebuild b/media-sound/spiralmodular/spiralmodular-0.2.2a.ebuild
new file mode 100644
index 000000000000..dcd239d0fdae
--- /dev/null
+++ b/media-sound/spiralmodular/spiralmodular-0.2.2a.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.1 2004/03/21 03:49:50 eradicator Exp $
+
+inherit eutils
+
+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"
+RESTRICT="nomirror"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+DEPEND=">=x11-libs/fltk-1.1
+	media-libs/libsndfile
+	media-libs/liblrdf
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	media-libs/ladspa-sdk"
+
+S=${WORKDIR}/${PN}-0.2.2
+
+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/lib /usr/share/man /usr/share/info
+	dodoc Examples/*
+	make bindir=${D}/usr/bin libdir=${D}/usr/lib 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 ""
+}