Version bump. Added to ~sparc. Removing old versions.

8 files changed, 44 insertions, 107 deletions

diff --git a/media-sound/awesfx/ChangeLog b/media-sound/awesfx/ChangeLog
index 1ad93573c555..ab7bc8b7a22a 100644
--- a/media-sound/awesfx/ChangeLog
+++ b/media-sound/awesfx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/awesfx
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/awesfx/ChangeLog,v 1.14 2004/10/14 21:29:18 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/awesfx/ChangeLog,v 1.15 2004/12/08 12:05:53 eradicator Exp $
+
+*awesfx-0.5.0d (08 Dec 2004)
+
+  08 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -awesfx-0.4.4.ebuild, -awesfx-0.5.0b.ebuild, awesfx-0.5.0c.ebuild,
+  +awesfx-0.5.0d.ebuild:
+  Version bump.  Added to ~sparc.  Removing old versions.
 
   14 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
   awesfx-0.4.4.ebuild:
diff --git a/media-sound/awesfx/Manifest b/media-sound/awesfx/Manifest
index a5c38a95f99b..be6960316ed0 100644
--- a/media-sound/awesfx/Manifest
+++ b/media-sound/awesfx/Manifest
@@ -1,20 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c3631fd0a349a41062dde501ae84ea21 ChangeLog 1582
-MD5 a276ad27e531666b0fb0931efc3ca9ce awesfx-0.4.4.ebuild 1520
-MD5 b32d7a292377152f131db8676889ea07 awesfx-0.5.0b.ebuild 1166
+MD5 88d916cd0f659aeb077d9452fa95a683 awesfx-0.5.0d.ebuild 1190
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 02d5503276a2387a75fa187b22861d48 awesfx-0.5.0c.ebuild 1161
+MD5 d21710baaed25dbc38ab6f7e71cf2758 awesfx-0.5.0c.ebuild 1188
 MD5 f2718083317de4e006954291d3da6f4e files/awesfx-0.5.0b-configure-noalsa.patch 7814
 MD5 a2f1d07a053240ebc621d1834c928e6f files/awesfx-0.5.0b-makefile-noalsa.patch 3507
-MD5 0510ed427cbce41e3cccf010d8a2b053 files/digest-awesfx-0.4.4 64
-MD5 65393e10260fc71e0093e7337c7703c9 files/digest-awesfx-0.5.0b 65
+MD5 a1f68aeea912a0dfbc5ed004d02b2bda files/digest-awesfx-0.5.0d 65
 MD5 413587b49e630a9b899620cc979a5a5d files/digest-awesfx-0.5.0c 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBbvAvArHZZzCEUG0RAlnhAJ973pQBRMh45MPggrr3wN9OzbNM4QCfRf4i
-yWKSDcTpueLHNDWnS0mgyNg=
-=FTSh
------END PGP SIGNATURE-----
diff --git a/media-sound/awesfx/awesfx-0.4.4.ebuild b/media-sound/awesfx/awesfx-0.4.4.ebuild
deleted file mode 100644
index 5d835e6708d6..000000000000
--- a/media-sound/awesfx/awesfx-0.4.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/awesfx/awesfx-0.4.4.ebuild,v 1.11 2004/10/14 21:29:18 eradicator Exp $
-
-IUSE=""
-
-inherit toolchain-funcs
-
-DESCRIPTION="AWE Utilities - sfxload"
-HOMEPAGE="http://mitglied.lycos.de/iwai/awedrv.html"
-SRC_URI="http://mitglied.lycos.de/iwai/${P}.tar.bz2"
-
-DEPEND="virtual/libc"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	# use shared build, not static
-	sed -e "s:\$(CDEBUGFLAGS)\( \$(CINCS)\) \$(CDEFS):\1 ${CFLAGS}:" \
-		Makefile-shared > Makefile
-
-	cd awelib
-	sed -e "s:\$(CDEBUGFLAGS)\( \$(CINCS)\) \$(CDEFS):\1 ${CFLAGS}:" \
-		Makefile-shared > Makefile
-
-	mv config.h config.h.orig
-	sed -e 's|/usr/local/lib/sfbank:/dos/sb32/sfbank|/usr/share/sfbank|' \
-		config.h.orig > config.h
-}
-
-src_compile() {
-	export CC="$(tc-getCC)"
-	make \
-		INSTDIR=${D}/usr \
-		BINDIR=${D}/usr/bin \
-		INCDIR=${D}/usr/include/awe \
-		LIBDIR=${D}/usr/lib \
-		MANDIR=${D}/usr/share/man \
-		BANKDIR=${D}/usr/share/sfbank \
-		all || die "compile problem"
-}
-
-src_install() {
-
-	make \
-		INSTDIR=${D}/usr \
-		BINDIR=${D}/usr/bin \
-		INCDIR=${D}/usr/include/awe \
-		LIBDIR=${D}/usr/lib \
-		MANDIR=${D}/usr/share/man \
-		BANKDIR=${D}/usr/share/sfbank \
-		install || die "compile problem"
-
-	dodoc docs/*
-}
-
-pkg_postinst() {
-	einfo "Please copy your SoundFont files from the original CD-ROM"
-	einfo "shipped with your soundcard to"
-	einfo "/usr/share/sfbank"
-}
diff --git a/media-sound/awesfx/awesfx-0.5.0c.ebuild b/media-sound/awesfx/awesfx-0.5.0c.ebuild
index 36876a5d072e..17ec9ed3f46f 100644
--- a/media-sound/awesfx/awesfx-0.5.0c.ebuild
+++ b/media-sound/awesfx/awesfx-0.5.0c.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/awesfx/awesfx-0.5.0c.ebuild,v 1.3 2004/09/03 09:50:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/awesfx/awesfx-0.5.0c.ebuild,v 1.4 2004/12/08 12:05:53 eradicator Exp $
 
 IUSE="alsa"
 
@@ -9,21 +9,25 @@ inherit eutils
 DESCRIPTION="AWE Utilities - sfxload"
 HOMEPAGE="http://www.alsa-project.org/~iwai/awedrv.html#Utils"
 SRC_URI=http://www.alsa-project.org/~iwai/${P}.tar.gz
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 amd64 ~ppc"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+
 DEPEND="virtual/libc
 	alsa? ( >=media-libs/alsa-lib-1.0.0 )"
 
+BANK_LOC="/usr/share/sounds/sf2"
+
 src_compile() {
 	if ! use alsa; then
 		einfo "Removing ALSA support!"
 		epatch ${FILESDIR}/${PN}-0.5.0b-configure-noalsa.patch
-		econf --with-sfpath=/usr/share/sfbank || die
+		econf --with-sfpath=${BANK_LOC} || die
 		epatch ${FILESDIR}/${PN}-0.5.0b-makefile-noalsa.patch
 		sed -i -e 's/'^LIBS.*-lasound.*$'/LIBS = -lm -ldl -lpthread/' Makefile
 	else
-		econf --with-sfpath=/usr/share/sfbank || die
+		econf --with-sfpath=${BANK_LOC} || die
 	fi
 
 	emake || die
@@ -31,12 +35,12 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog INSTALL README SBKtoSF2.txt
+	dodoc AUTHORS ChangeLog README SBKtoSF2.txt
+	dodoc ${D}/usr/share/sounds/sf2/README-bank
+	rm ${D}/usr/share/sounds/sf2/README-bank
 }
 
 pkg_postinst() {
 	einfo "Please copy your SoundFont files from the original CD-ROM"
-	einfo "shipped with your soundcard to"
-	einfo "/usr/share/sfbank"
+	einfo "shipped with your soundcard to ${BANK_LOC}"
 }
-
diff --git a/media-sound/awesfx/awesfx-0.5.0b.ebuild b/media-sound/awesfx/awesfx-0.5.0d.ebuild
index da2af01bf32e..204e5f13ebd1 100644
--- a/media-sound/awesfx/awesfx-0.5.0b.ebuild
+++ b/media-sound/awesfx/awesfx-0.5.0d.ebuild
@@ -1,41 +1,46 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/awesfx/awesfx-0.5.0b.ebuild,v 1.5 2004/07/01 07:48:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/awesfx/awesfx-0.5.0d.ebuild,v 1.1 2004/12/08 12:05:53 eradicator Exp $
+
+IUSE="alsa"
 
 inherit eutils
 
 DESCRIPTION="AWE Utilities - sfxload"
 HOMEPAGE="http://www.alsa-project.org/~iwai/awedrv.html#Utils"
 SRC_URI=http://www.alsa-project.org/~iwai/${P}.tar.gz
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~amd64"
-IUSE="alsa"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
 DEPEND="virtual/libc
 	alsa? ( >=media-libs/alsa-lib-1.0.0 )"
 
+BANK_LOC="/usr/share/sounds/sf2"
+
 src_compile() {
-	if ! use alsa
-	then
+	if ! use alsa; then
 		einfo "Removing ALSA support!"
-		epatch ${FILESDIR}/${P}-configure-noalsa.patch
+		epatch ${FILESDIR}/${PN}-0.5.0b-configure-noalsa.patch
+		econf --with-sfpath=${BANK_LOC} || die
+		epatch ${FILESDIR}/${PN}-0.5.0b-makefile-noalsa.patch
+		sed -i -e 's/'^LIBS.*-lasound.*$'/LIBS = -lm -ldl -lpthread/' Makefile
+	else
+		econf --with-sfpath=${BANK_LOC} || die
 	fi
-	econf --with-sfpath=/usr/share/sfbank || die
-	use alsa || epatch ${FILESDIR}/${P}-makefile-noalsa.patch
-	#only asfxload seems to need libasound
-	use alsa && sed -i -e 's/'^LIBS.*-lasound.*$'/LIBS = -lm -ldl -lpthread/' Makefile
+
 	emake || die
 }
 
 src_install() {
 	make DESTDIR=${D} install || die
-	# einstall || die
-	dodoc AUTHORS ChangeLog INSTALL README SBKtoSF2.txt
+	dodoc AUTHORS ChangeLog README SBKtoSF2.txt
+	dodoc ${D}/usr/share/sounds/sf2/README-bank
+	rm ${D}/usr/share/sounds/sf2/README-bank
 }
 
 pkg_postinst() {
 	einfo "Please copy your SoundFont files from the original CD-ROM"
-	einfo "shipped with your soundcard to"
-	einfo "/usr/share/sfbank"
+	einfo "shipped with your soundcard to ${BANK_LOC}"
 }
-
diff --git a/media-sound/awesfx/files/digest-awesfx-0.4.4 b/media-sound/awesfx/files/digest-awesfx-0.4.4
deleted file mode 100644
index 38e3dbe27216..000000000000
--- a/media-sound/awesfx/files/digest-awesfx-0.4.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0f79e9b5f0fccf6b876b1256d2450e8e awesfx-0.4.4.tar.bz2 58426
diff --git a/media-sound/awesfx/files/digest-awesfx-0.5.0b b/media-sound/awesfx/files/digest-awesfx-0.5.0b
deleted file mode 100644
index f75005156a61..000000000000
--- a/media-sound/awesfx/files/digest-awesfx-0.5.0b
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3f6668cf60544c17bb09dbd984a0d298 awesfx-0.5.0b.tar.gz 370808
diff --git a/media-sound/awesfx/files/digest-awesfx-0.5.0d b/media-sound/awesfx/files/digest-awesfx-0.5.0d
new file mode 100644
index 000000000000..ae45ab119784
--- /dev/null
+++ b/media-sound/awesfx/files/digest-awesfx-0.5.0d
@@ -0,0 +1 @@
+MD5 c258e52dd67a41fc20a31d25836c7256 awesfx-0.5.0d.tar.gz 375762