version bump #17048

7 files changed, 71 insertions, 90 deletions

diff --git a/app-emulation/psemu-peopsspu/ChangeLog b/app-emulation/psemu-peopsspu/ChangeLog
index 970a885e79f4..a793e28c5f92 100644
--- a/app-emulation/psemu-peopsspu/ChangeLog
+++ b/app-emulation/psemu-peopsspu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/psemu-peopsspu
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/psemu-peopsspu/ChangeLog,v 1.7 2003/02/12 04:02:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/psemu-peopsspu/ChangeLog,v 1.8 2003/03/10 10:07:09 vapier Exp $
+
+*psemu-peopsspu-1.0.5 (09 Mar 2003)
+
+  09 Mar 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #17048 + better support for oss/alsa.
 
 *psemu-peopsspu-1.0.2 (26 Nov 2002)
 
diff --git a/app-emulation/psemu-peopsspu/files/digest-psemu-peopsspu-1.0.1 b/app-emulation/psemu-peopsspu/files/digest-psemu-peopsspu-1.0.1
deleted file mode 100644
index 93b2ce38955b..000000000000
--- a/app-emulation/psemu-peopsspu/files/digest-psemu-peopsspu-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3c0a29029eb42dd567c95978ffe35ae5 PeopsSpu101.zip 216281
diff --git a/app-emulation/psemu-peopsspu/files/digest-psemu-peopsspu-1.0.2 b/app-emulation/psemu-peopsspu/files/digest-psemu-peopsspu-1.0.2
deleted file mode 100644
index f345eb6d5241..000000000000
--- a/app-emulation/psemu-peopsspu/files/digest-psemu-peopsspu-1.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b60854b9809f04cd8479c8a9db430448 PeopsSpu102.tar.gz 195825
diff --git a/app-emulation/psemu-peopsspu/files/digest-psemu-peopsspu-1.0.5 b/app-emulation/psemu-peopsspu/files/digest-psemu-peopsspu-1.0.5
new file mode 100644
index 000000000000..866e3ae8ce7b
--- /dev/null
+++ b/app-emulation/psemu-peopsspu/files/digest-psemu-peopsspu-1.0.5
@@ -0,0 +1 @@
+MD5 b8274c4a3d06d3667d36b3e2af5bbf81 PeopsSpu105.tar.gz 230377
diff --git a/app-emulation/psemu-peopsspu/psemu-peopsspu-1.0.1.ebuild b/app-emulation/psemu-peopsspu/psemu-peopsspu-1.0.1.ebuild
deleted file mode 100644
index 1b94beceab87..000000000000
--- a/app-emulation/psemu-peopsspu/psemu-peopsspu-1.0.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/psemu-peopsspu/psemu-peopsspu-1.0.1.ebuild,v 1.9 2003/02/13 07:16:11 vapier Exp $
-
-DESCRIPTION="P.E.Op.S Sound Emulation (SPU) PSEmu Plugin"
-HOMEPAGE="http://peops.sourceforge.net/"
-SRC_URI="mirror://sourceforge/peops/PeopsSpu${PV//./}.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="x86 -ppc"
-SLOT="0"
-
-DEPEND="app-arch/unzip
-	app-misc/fixdos
-	x11-libs/gtk+
-	sys-devel/automake"
-
-S=${WORKDIR}/spuPeopsSound
-
-src_compile() {
-	cd Src
-	mv StdAfx.c stdafx.c
-	mv StdAfx.h stdafx.h
-	mv OSS.H oss.h
-	emake CCFLAGS3="${CFLAGS} -fPIC -c -Wall -ffast-math -fomit-frame-pointer" || die
-
-	cd linuxcfg
-	tar xvfz spucfg.tar.gz
-	crlf .  # convert all files in dir from dos CRLF to unix CR format...
-	make distclean
-	automake --add-missing
-	econf
-	emake || die
-	mv src/spucfg src/cfgPeopsOSS
-}
-
-src_install () {
-	insinto /usr/lib/psemu/plugins
-	doins Src/libspu*
-	chmod 755 ${D}/usr/lib/psemu/plugins/*
-	insinto /usr/lib/psemu/cfg
-	doins Src/linuxcfg/src/cfgPeopsOSS
-	chmod 755 ${D}/usr/lib/psemu/cfg/*
-	dodoc Src/*.txt *.txt
-}
diff --git a/app-emulation/psemu-peopsspu/psemu-peopsspu-1.0.2.ebuild b/app-emulation/psemu-peopsspu/psemu-peopsspu-1.0.2.ebuild
deleted file mode 100644
index a262132ac8cd..000000000000
--- a/app-emulation/psemu-peopsspu/psemu-peopsspu-1.0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/psemu-peopsspu/psemu-peopsspu-1.0.2.ebuild,v 1.2 2003/02/13 07:16:15 vapier Exp $
-
-DESCRIPTION="P.E.Op.S Sound Emulation (SPU) PSEmu Plugin"
-HOMEPAGE="http://peops.sourceforge.net/"
-SRC_URI="mirror://sourceforge/peops/PeopsSpu${PV//./}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="x86 -ppc"
-SLOT="0"
-
-DEPEND="app-arch/unzip
-	app-misc/fixdos
-	x11-libs/gtk+
-	sys-devel/automake"
-
-S=${WORKDIR}
-
-src_compile() {
-	cd src
-	emake CCFLAGS3="${CFLAGS} -fPIC -c -Wall -ffast-math -fomit-frame-pointer" || die
-
-	cd linuxcfg
-	tar xvfz spucfg.tar.gz
-	crlf .  # convert all files in dir from dos CRLF to unix CR format...
-	emake distclean || die "could not clean up"
-	automake --add-missing || die "could not automake"
-	econf
-	emake || die
-	mv src/spucfg src/cfgPeopsOSS
-}
-
-src_install () {
-	insinto /usr/lib/psemu/plugins
-	doins src/libspu*
-	chmod 755 ${D}/usr/lib/psemu/plugins/*
-	insinto /usr/lib/psemu/cfg
-	doins src/linuxcfg/src/cfgPeopsOSS
-	chmod 755 ${D}/usr/lib/psemu/cfg/*
-	dodoc src/*.txt *.txt
-}
diff --git a/app-emulation/psemu-peopsspu/psemu-peopsspu-1.0.5.ebuild b/app-emulation/psemu-peopsspu/psemu-peopsspu-1.0.5.ebuild
new file mode 100644
index 000000000000..b36bb4a4fa42
--- /dev/null
+++ b/app-emulation/psemu-peopsspu/psemu-peopsspu-1.0.5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/psemu-peopsspu/psemu-peopsspu-1.0.5.ebuild,v 1.1 2003/03/10 10:07:09 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="P.E.Op.S Sound Emulation (SPU) PSEmu Plugin"
+HOMEPAGE="http://peops.sourceforge.net/"
+SRC_URI="mirror://sourceforge/peops/PeopsSpu${PV//./}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="x86 -ppc"
+SLOT="0"
+IUSE="alsa oss"
+
+DEPEND="alsa? ( media-libs/alsa-lib )
+	app-arch/unzip
+	=x11-libs/gtk+-1*
+	sys-devel/automake"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+
+	cd src/linuxcfg
+	tar -zxf spucfg.tar.gz
+	cd ${S}
+	edos2unix `find -name '*.in' -o -name '*.am' -o -name '*.[ch]' -o -name 'config*'`
+
+	cd src/linuxcfg
+	( automake --add-missing && emake distclean ) \
+		> /dev/null || die "could not clean up"
+}
+
+src_compile() {
+	rm libspu*
+	cd src
+	if [ `use oss` ] || [ -z "`use oss``use alsa`" ] ; then
+		emake clean || die
+		emake USEALSA=FALSE CCFLAGS3="${CFLAGS} -fPIC -c -Wall -ffast-math -fomit-frame-pointer" || die
+		mv libspu* ..
+	fi
+	if [ `use alsa` ] ; then
+		emake clean || die
+		emake USEALSA=TRUE CCFLAGS3="${CFLAGS} -fPIC -c -Wall -ffast-math -fomit-frame-pointer" || die
+		mv libspu* ..
+	fi
+
+	cd linuxcfg
+	econf || die
+	emake || die
+	mv src/spucfg src/cfgPeopsOSS
+}
+
+src_install() {
+	insinto /usr/lib/psemu/plugins
+	doins libspu*
+	chmod 755 ${D}/usr/lib/psemu/plugins/*
+	insinto /usr/lib/psemu/cfg
+	doins src/linuxcfg/src/cfgPeopsOSS
+	chmod 755 ${D}/usr/lib/psemu/cfg/*
+	dodoc src/*.txt *.txt
+}