new upstream version. 0.11.1_beta stable on amd64 and x86. some generall cleanup. sampletype now controlled by a useflag, fixes #93405

(Portage version: 2.0.51.22-r1)

6 files changed, 49 insertions, 36 deletions

diff --git a/media-sound/rezound/ChangeLog b/media-sound/rezound/ChangeLog
index 915912bb09b1..c39e7fc5aa87 100644
--- a/media-sound/rezound/ChangeLog
+++ b/media-sound/rezound/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/rezound
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rezound/ChangeLog,v 1.21 2004/12/23 20:18:49 hansmi Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rezound/ChangeLog,v 1.22 2005/05/21 09:38:00 luckyduck Exp $
+
+*rezound-0.12.0_beta (21 May 2005)
+
+  21 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -rezound-0.10.0_beta.ebuild, rezound-0.11.1_beta.ebuild,
+  +rezound-0.12.0_beta.ebuild:
+  new upstream version. 0.11.1_beta stable on amd64 and x86. some generall
+  cleanup. sampletype now controlled by a useflag, fixes #93405
 
   23 Dec 2004; Michael Hanselmann <hansmi@gentoo.org>
   +files/undefined-functions.patch, rezound-0.11.1_beta.ebuild:
diff --git a/media-sound/rezound/Manifest b/media-sound/rezound/Manifest
index 20ef580ec944..919b79ce071b 100644
--- a/media-sound/rezound/Manifest
+++ b/media-sound/rezound/Manifest
@@ -1,7 +1,7 @@
-MD5 e3ab652fbee5e2fadaa4c62e28386b17 rezound-0.10.0_beta.ebuild 1978
-MD5 caedd18d7bb2a20bcf623d76176f3b39 rezound-0.11.1_beta.ebuild 2218
-MD5 1b0bff8575789ccc7fca67e16ba45076 ChangeLog 3610
+MD5 0f4027415787e980f03dbfcd43afd5fc rezound-0.12.0_beta.ebuild 2206
+MD5 769cc73936122d7a1164f88d8dd82eb6 rezound-0.11.1_beta.ebuild 2216
+MD5 71125f0fcb4ad0551e5abd70fb441369 ChangeLog 3928
 MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221
 MD5 e91a09314efa10c88b5ad68c8ced9be7 files/digest-rezound-0.11.1_beta 71
-MD5 918c9dd021033e4b01d639be84718c65 files/digest-rezound-0.10.0_beta 71
 MD5 3bc1175bcfa6d88bbe86f84556db560c files/undefined-functions.patch 1084
+MD5 eaabd57938c6ccc9beb2a34516dd6da6 files/digest-rezound-0.12.0_beta 71
diff --git a/media-sound/rezound/files/digest-rezound-0.10.0_beta b/media-sound/rezound/files/digest-rezound-0.10.0_beta
deleted file mode 100644
index 499dade78b4c..000000000000
--- a/media-sound/rezound/files/digest-rezound-0.10.0_beta
+++ /dev/null
@@ -1 +0,0 @@
-MD5 607740eca99e36c1f1ca1d01b91cb5bf rezound-0.10.0beta.tar.gz 1483212
diff --git a/media-sound/rezound/files/digest-rezound-0.12.0_beta b/media-sound/rezound/files/digest-rezound-0.12.0_beta
new file mode 100644
index 000000000000..f4bffaa5cbc3
--- /dev/null
+++ b/media-sound/rezound/files/digest-rezound-0.12.0_beta
@@ -0,0 +1 @@
+MD5 3a47c848da6093f8d213d4529e3cdec3 rezound-0.12.0beta.tar.gz 1784776
diff --git a/media-sound/rezound/rezound-0.11.1_beta.ebuild b/media-sound/rezound/rezound-0.11.1_beta.ebuild
index 1c1b1b2f45ee..9fe90c5e8166 100644
--- a/media-sound/rezound/rezound-0.11.1_beta.ebuild
+++ b/media-sound/rezound/rezound-0.11.1_beta.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rezound/rezound-0.11.1_beta.ebuild,v 1.4 2004/12/29 02:52:40 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rezound/rezound-0.11.1_beta.ebuild,v 1.5 2005/05/21 09:38:00 luckyduck Exp $
 
 IUSE="alsa oggvorbis jack nls oss portaudio flac soundtouch"
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="virtual/x11
 	=sci-libs/fftw-2*
diff --git a/media-sound/rezound/rezound-0.10.0_beta.ebuild b/media-sound/rezound/rezound-0.12.0_beta.ebuild
index da713e2e2947..1ab72f25d6cc 100644
--- a/media-sound/rezound/rezound-0.10.0_beta.ebuild
+++ b/media-sound/rezound/rezound-0.12.0_beta.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rezound/rezound-0.10.0_beta.ebuild,v 1.5 2004/12/29 02:52:40 ribosome Exp $
-
-IUSE="oggvorbis jack nls oss portaudio flac soundtouch"
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rezound/rezound-0.12.0_beta.ebuild,v 1.1 2005/05/21 09:38:00 luckyduck Exp $
 
 inherit eutils
 
@@ -13,9 +11,10 @@ DESCRIPTION="Sound editor and recorder"
 HOMEPAGE="http://rezound.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc x86"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="16bittmp alsa flac jack nls oss portaudio soundtouch vorbis"
 
 RDEPEND="virtual/x11
 	=sci-libs/fftw-2*
@@ -23,11 +22,12 @@ RDEPEND="virtual/x11
 	>=media-libs/audiofile-0.2.3
 	>=media-libs/ladspa-sdk-1.12
 	>=media-libs/ladspa-cmt-1.15
+	alsa? ( >=media-libs/alsa-lib-1.0 )
 	flac? ( >=media-libs/flac-1.1.0 )
-	oggvorbis? ( media-libs/libvorbis media-libs/libogg )
 	jack? ( media-sound/jack-audio-connection-kit )
 	portaudio? ( >=media-libs/portaudio-18 )
-	soundtouch? ( >=media-libs/libsoundtouch-1.2.1 )"
+	soundtouch? ( >=media-libs/libsoundtouch-1.2.1 )
+	vorbis? ( media-libs/libvorbis media-libs/libogg )"
 
 # optional packages (don't need to be installed during emerge):
 #
@@ -41,35 +41,40 @@ DEPEND="${RDEPEND}
 	sys-devel/flex"
 
 src_compile() {
-	local myconf=""
-
-	# enforce minimum defaults
-	myconf="${myconf} --enable-ladspa"
-	myconf="${myconf} --enable-largefile"
-	myconf="${myconf} --enable-internal-sample-type=float"
-
-	# enable/disable depending on USE flags
-	myconf="${myconf} `use_enable nls`"
-	myconf="${myconf} `use_enable oss`"
-	myconf="${myconf} `use_enable jack`"
-	myconf="${myconf} `use_enable portaudio`"
+	# fix compilation errors on ppc, where some
+	# of the required functions aren't defined
+	#test "${ARCH}" = ppc && epatch ${FILESDIR}/undefined-functions.patch
 
 	# following features can't be disabled if already installed:
 	# -> flac, oggvorbis, soundtouch
-
-	econf ${myconf} || die
-	emake || die
+	local sampletype=""
+	use 16bittmp && sampletype="--enable-internal-sample-type=int16"
+	use 16bittmp || sampletype="--enable-internal-sample-type=float"
+
+	econf \
+		$(use_enable alsa) \
+		$(use_enable jack) \
+		$(use_enable nls) \
+		$(use_enable oss) \
+		$(use_enable portaudio) \
+		${sampletype} \
+		--enable-ladspa \
+		--enable-largefile \
+		|| die "configure failed"
+
+	emake || die "make failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	make DESTDIR="${D}" install || die "make install failed"
 
 	# remove wrong doc directory
 	rm -rf ${D}/usr/doc/${PN}
 	# install docs manually, but don't install
 	# COPYING, since this is obsolete ($LICENCE is enough)
-	dodoc ABOUT-NLS docs/{AUTHORS,*INSTALL,NEWS,README*,TODO_FOR_USERS_TO_READ,*.txt}
+	dodoc ABOUT-NLS docs/{AUTHORS,*INSTALL,NEWS,README*}
+	dodoc docs/{TODO_FOR_USERS_TO_READ,*.txt}
+
 	docinto code
 	dodoc docs/code/*
 }
-