remove odl

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

7 files changed, 11 insertions, 384 deletions

diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index 5ae258cc2cff..8144014b0841 100644
--- a/media-sound/audacity/ChangeLog
+++ b/media-sound/audacity/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/audacity
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.140 2010/06/16 12:41:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.141 2010/06/16 12:42:44 aballier Exp $
+
+  16 Jun 2010; Alexis Ballier <aballier@gentoo.org>
+  -files/audacity-1.3.7-cflags.patch, -audacity-1.3.9.ebuild,
+  -files/audacity-1.3.9-noflac.patch, -audacity-1.3.10.ebuild,
+  -audacity-1.3.11.ebuild:
+  remove old
 
   16 Jun 2010; Alexis Ballier <aballier@gentoo.org>
   -files/audacity-1.3.4-automagic.patch,
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 004e54563cdb..8f1fe85899a9 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -2,26 +2,18 @@
 Hash: SHA1
 
 AUX audacity-1.3.12-automagic.patch 2616 RMD160 46df352f4bf38276764361a13788547f9aa96d9e SHA1 f0f36031d277e1fd32681144ae1eb3669a54fc0e SHA256 655dbfc792c0c3373cf7062db0c478a1bd632aa1e7209f19f057a7d983d20960
-AUX audacity-1.3.7-cflags.patch 1099 RMD160 db05c38ce8ae3d91f7ec928f8096a089368d7414 SHA1 d6b5a69c28eb16fb9dcacebc2e461d53f7951106 SHA256 eab7268b3b7b3c2ac2eb07ede639c16f3babccc528f018af17a532082b478ca9
 AUX audacity-1.3.8-automagic.patch 2625 RMD160 af4edacf4d9d331b7daa56d20ee55da5ae7759dc SHA1 4e91de0cecde8a75f14830e9446d6fbb0fc3036a SHA256 a7cc0fd0566877d50d5c8d0568a26dc163f2db1b74314791ff0b4060dafdae81
 AUX audacity-1.3.8-gsocket-conflict.patch 410 RMD160 c5e2716c4a7e9df8d4ebf05a3f226c719c1715e0 SHA1 fe9a1c08399bad5d34839c78c023bd9fea9228fd SHA256 2b77e18c378696392d04e5e1e14285433ee9e904bc95bdd1ec245edfd31efb20
-AUX audacity-1.3.9-noflac.patch 1990 RMD160 7f16abef5e98773f853e45a4c2a4c15995ac7239 SHA1 2a76dcd0fd16b338b4c2cd1a78ab8966c351223a SHA256 6d1c90629ee0c7d38180012bdc29f28ae6074d2fd2a37570d0500edb86743724
-DIST audacity-minsrc-1.3.10.tar.bz2 6953513 RMD160 335564980b5692eff6338723bcbe60b4590dcce9 SHA1 f321f4abec9c282a213685e0189de2d5740a795c SHA256 7df8a12064cbd85b85a38ad56942dbbf46eace7ea685ec64daca9ad064e2ba09
-DIST audacity-minsrc-1.3.11.tar.bz2 7142931 RMD160 4ce073a5998c80eb31f5f40dcd198906bd5faf01 SHA1 7e08f82c36d118758c12b056cbe70f6490681d4f SHA256 2d59d5eeb2acf451142263876a7bebcab91bbff137c867effaf77d52c963e271
 DIST audacity-minsrc-1.3.12-beta.tar.bz2 6087920 RMD160 47dd021c24fb6ed05a845604db28056d981c28d3 SHA1 3df2187c9e869be6745fb1e1396586b9b0486485 SHA256 f0f55839ca3013d2e43e5114c73d195bc34503685aeab683eafca4d1bbf3b768
 DIST audacity-minsrc-1.3.8.tar.bz2 6734200 RMD160 3ae7ed409520b62f40e4c9fcd49ea5a25827b8a3 SHA1 8b8e5dbbf38546c08eb77005f77648d28836dfd4 SHA256 50132fead4de4382e603fa14f0a7ffe87c4db86ddcfda1a472b8fa0dc7fb41cf
-DIST audacity-minsrc-1.3.9.tar.bz2 6719955 RMD160 eb7bcf3716498705fbcb318b9d8d5183c28678f6 SHA1 77330b3bb70070001262f6e3c7d74a1d94c93c5e SHA256 f47afe8dcf38165d3550160eb7e94694119f5da563674060a93c5bc66e2fa012
-EBUILD audacity-1.3.10.ebuild 2600 RMD160 3749b98542545bf78fb360179d5014925a054824 SHA1 f081542a6c574fef63e1de7308339ac045e70605 SHA256 7e6941793c28332230b080c295ed8e842c02f2dfa4f1702366b9f8d41aa6a617
-EBUILD audacity-1.3.11.ebuild 2605 RMD160 c7b1127013e426bfd772bfb2879c87eadbb1439e SHA1 a394798ac7b0c3951d31f3df80281b66ac23dabd SHA256 8a9de21289d8546aaa4ed3281daf21673a897938e49194a801cc749e46003864
 EBUILD audacity-1.3.12.ebuild 2611 RMD160 33e02639afd57b46aa41e2777fc0640952c423ab SHA1 84a20ef7cf1f20e0c31120fd3be16bfec9f56d1a SHA256 8c40dbb66f36465f9f92fc3681c9a5040c693b1cf4010d1b707286df572af496
 EBUILD audacity-1.3.8.ebuild 2645 RMD160 57193ede7b6070a39e273956454b3d1745400eff SHA1 4416347b21cfe056a3be4d5b8db69d5d1ebbf378 SHA256 f1be23f771d0ca552a85af52783a5ec14a9ec3818a624b7856273f98ab2c7cfb
-EBUILD audacity-1.3.9.ebuild 2696 RMD160 5a240e5400d6271d60acb7994188572076e5eacc SHA1 d2f62145c3200f21ae5384b12ab5d995212c0a54 SHA256 770e57d03b1b82f6256026129a7033fb111582c01336df39c076ea0ac6cb30b0
-MISC ChangeLog 23166 RMD160 478f68666b6ff9b3a4dcb9381ba1c16d16523728 SHA1 0beeb05853ee23c14a05fc1eb2957cf1ef77a60f SHA256 e75b15d18078bd871d537bd8497a3bc765f2425a40dc0a8093d437c297a40d12
+MISC ChangeLog 23384 RMD160 713a95fa56716d2fb79464ba93a0a7b57c425329 SHA1 03f44e2253eb6cc3642dfaa82ebcc5b58d6ba629 SHA256 ed809a44c72ce1851683773aa588027e297653d2f9b36f790b6413fb04619c2c
 MISC metadata.xml 727 RMD160 3306c64d261828fe7ef77a6b10b86bdef95a7e90 SHA1 037f78e7a8bcd2a9691ea7a09078941b385b6737 SHA256 43d8778afc3c468b262cddd50200c8b0c54674fda12b8d8e55b0ce0f8f1a6e85
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwYxmkACgkQvFcC4BYPU0qqnACeIK6LYJRYI6Mk9R0ClNSftnrH
-I5gAn1qdX3oIawnXNrZFSXBiEcy+qW44
-=tHdn
+iEYEARECAAYFAkwYxsgACgkQvFcC4BYPU0q6lQCeJup9oOErNM/J66aDwxnfBE5y
+epMAn36pXRcSN55st8WQ2m5c6aLSgB9w
+=vQTp
 -----END PGP SIGNATURE-----
diff --git a/media-sound/audacity/audacity-1.3.10.ebuild b/media-sound/audacity/audacity-1.3.10.ebuild
deleted file mode 100644
index 24fb416e6caa..000000000000
--- a/media-sound/audacity/audacity-1.3.10.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.10.ebuild,v 1.1 2009/12/05 09:28:16 aballier Exp $
-
-EAPI=2
-
-inherit eutils wxwidgets autotools versionator
-
-IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate midi mp3 soundtouch twolame vamp vorbis"
-
-MY_PV=$(replace_version_separator 3 -)
-MY_P="${PN}-src-${MY_PV}"
-MY_T="${PN}-minsrc-${MY_PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="http://audacity.sourceforge.net/"
-SRC_URI="http://${PN}.googlecode.com/files/${MY_T}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-RESTRICT="test"
-
-COMMON_DEPEND="=x11-libs/wxGTK-2.8*
-	>=app-arch/zip-2.3
-	>=media-libs/libsndfile-1.0.0
-	dev-libs/expat
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
-	vorbis? ( >=media-libs/libvorbis-1.0 )
-	mp3? ( >=media-libs/libmad-0.14.2b )
-	flac? ( >=media-libs/flac-1.2.0[cxx] )
-	id3tag? ( media-libs/libid3tag )
-	soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
-	vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
-	twolame? ( media-sound/twolame )
-	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080617 )
-	alsa? ( media-libs/alsa-lib )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )"
-# Crashes at  startup here...
-#	lv2? ( >=media-libs/slv2-0.6.0 )
-# Disabled upstream ATM
-#  ladspa? ( >=media-libs/liblrdf-0.4.0 )
-
-RDEPEND="${COMMON_DEPEND}
-	mp3? ( >=media-sound/lame-3.70 )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.3.8-automagic.patch"
-	AT_M4DIR="${S}/m4" eautoreconf
-}
-
-src_configure() {
-	WX_GTK_VER="2.8"
-	need-wxwidgets unicode
-
-	# * always use system libraries if possible
-	# * options listed in the order that configure --help lists them
-	# * if libsamplerate not requested, use libresample instead.
-	econf \
-		--enable-unicode \
-		--enable-nyquist \
-		$(use_enable ladspa) \
-		--with-libsndfile=system \
-		--with-expat=system \
-		$(use_with libsamplerate) \
-		$(use_with !libsamplerate libresample) \
-		$(use_with vorbis libvorbis) \
-		$(use_with mp3 libmad) \
-		$(use_with flac libflac) \
-		$(use_with id3tag libid3tag) \
-		$(use_with soundtouch) \
-		$(use_with vamp libvamp) \
-		$(use_with twolame libtwolame) \
-		$(use_with ffmpeg) \
-		$(use_with midi) \
-		$(use_with alsa) \
-		$(use_with jack)
-}
-
-# $(use_with lv2 slv2) \
-# $(use_with ladspa liblrdf) \
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	# Remove bad doc install
-	rm -rf "${D}"/usr/share/doc
-
-	# Install our docs
-	dodoc README.txt
-}
diff --git a/media-sound/audacity/audacity-1.3.11.ebuild b/media-sound/audacity/audacity-1.3.11.ebuild
deleted file mode 100644
index 285e9fe0ecaf..000000000000
--- a/media-sound/audacity/audacity-1.3.11.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.11.ebuild,v 1.1 2010/01/20 19:06:10 aballier Exp $
-
-EAPI=2
-
-inherit eutils wxwidgets autotools versionator
-
-IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate midi mp3 soundtouch twolame vamp vorbis"
-
-MY_PV=$(replace_version_separator 3 -)
-MY_P="${PN}-src-${MY_PV}-beta"
-MY_T="${PN}-minsrc-${MY_PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="http://audacity.sourceforge.net/"
-SRC_URI="http://${PN}.googlecode.com/files/${MY_T}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-RESTRICT="test"
-
-COMMON_DEPEND="=x11-libs/wxGTK-2.8*
-	>=app-arch/zip-2.3
-	>=media-libs/libsndfile-1.0.0
-	dev-libs/expat
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
-	vorbis? ( >=media-libs/libvorbis-1.0 )
-	mp3? ( >=media-libs/libmad-0.14.2b )
-	flac? ( >=media-libs/flac-1.2.0[cxx] )
-	id3tag? ( media-libs/libid3tag )
-	soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
-	vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
-	twolame? ( media-sound/twolame )
-	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080617 )
-	alsa? ( media-libs/alsa-lib )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )"
-# Crashes at  startup here...
-#	lv2? ( >=media-libs/slv2-0.6.0 )
-# Disabled upstream ATM
-#  ladspa? ( >=media-libs/liblrdf-0.4.0 )
-
-RDEPEND="${COMMON_DEPEND}
-	mp3? ( >=media-sound/lame-3.70 )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.3.8-automagic.patch"
-	AT_M4DIR="${S}/m4" eautoreconf
-}
-
-src_configure() {
-	WX_GTK_VER="2.8"
-	need-wxwidgets unicode
-
-	# * always use system libraries if possible
-	# * options listed in the order that configure --help lists them
-	# * if libsamplerate not requested, use libresample instead.
-	econf \
-		--enable-unicode \
-		--enable-nyquist \
-		$(use_enable ladspa) \
-		--with-libsndfile=system \
-		--with-expat=system \
-		$(use_with libsamplerate) \
-		$(use_with !libsamplerate libresample) \
-		$(use_with vorbis libvorbis) \
-		$(use_with mp3 libmad) \
-		$(use_with flac libflac) \
-		$(use_with id3tag libid3tag) \
-		$(use_with soundtouch) \
-		$(use_with vamp libvamp) \
-		$(use_with twolame libtwolame) \
-		$(use_with ffmpeg) \
-		$(use_with midi) \
-		$(use_with alsa) \
-		$(use_with jack)
-}
-
-# $(use_with lv2 slv2) \
-# $(use_with ladspa liblrdf) \
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	# Remove bad doc install
-	rm -rf "${D}"/usr/share/doc
-
-	# Install our docs
-	dodoc README.txt
-}
diff --git a/media-sound/audacity/audacity-1.3.9.ebuild b/media-sound/audacity/audacity-1.3.9.ebuild
deleted file mode 100644
index a634b18b95f2..000000000000
--- a/media-sound/audacity/audacity-1.3.9.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.9.ebuild,v 1.2 2009/09/23 18:48:02 aballier Exp $
-
-EAPI=2
-
-inherit eutils wxwidgets autotools versionator
-
-IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate midi mp3 soundtouch twolame vamp vorbis"
-
-MY_PV=$(replace_version_separator 3 -)
-MY_P="${PN}-src-${MY_PV}"
-MY_T="${PN}-minsrc-${MY_PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="http://audacity.sourceforge.net/"
-SRC_URI="http://${PN}.googlecode.com/files/${MY_T}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-RESTRICT="test"
-
-COMMON_DEPEND="=x11-libs/wxGTK-2.8*
-	>=app-arch/zip-2.3
-	>=media-libs/libsndfile-1.0.0
-	dev-libs/expat
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
-	vorbis? ( >=media-libs/libvorbis-1.0 )
-	mp3? ( >=media-libs/libmad-0.14.2b )
-	flac? ( >=media-libs/flac-1.2.0[cxx] )
-	id3tag? ( media-libs/libid3tag )
-	soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
-	vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
-	twolame? ( media-sound/twolame )
-	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080617 )
-	alsa? ( media-libs/alsa-lib )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )"
-# Crashes at  startup here...
-#	lv2? ( >=media-libs/slv2-0.6.0 )
-# Disabled upstream ATM
-#  ladspa? ( >=media-libs/liblrdf-0.4.0 )
-
-RDEPEND="${COMMON_DEPEND}
-	mp3? ( >=media-sound/lame-3.70 )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.3.8-automagic.patch"
-	epatch "${FILESDIR}/${PN}-1.3.8-gsocket-conflict.patch"
-	epatch "${FILESDIR}/${P}-noflac.patch"
-	AT_M4DIR="${S}/m4" eautoreconf
-}
-
-src_configure() {
-	WX_GTK_VER="2.8"
-	need-wxwidgets unicode
-
-	# * always use system libraries if possible
-	# * options listed in the order that configure --help lists them
-	# * if libsamplerate not requested, use libresample instead.
-	econf \
-		--enable-unicode \
-		--enable-nyquist \
-		$(use_enable ladspa) \
-		--with-libsndfile=system \
-		--with-expat=system \
-		$(use_with libsamplerate) \
-		$(use_with !libsamplerate libresample) \
-		$(use_with vorbis libvorbis) \
-		$(use_with mp3 libmad) \
-		$(use_with flac libflac) \
-		$(use_with id3tag libid3tag) \
-		$(use_with soundtouch) \
-		$(use_with vamp libvamp) \
-		$(use_with twolame libtwolame) \
-		$(use_with ffmpeg) \
-		$(use_with midi) \
-		$(use_with alsa) \
-		$(use_with jack)
-}
-
-# $(use_with lv2 slv2) \
-# $(use_with ladspa liblrdf) \
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	# Remove bad doc install
-	rm -rf "${D}"/usr/share/doc
-
-	# Install our docs
-	dodoc README.txt
-}
diff --git a/media-sound/audacity/files/audacity-1.3.7-cflags.patch b/media-sound/audacity/files/audacity-1.3.7-cflags.patch
deleted file mode 100644
index cdd9425e78b6..000000000000
--- a/media-sound/audacity/files/audacity-1.3.7-cflags.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: audacity-src-1.3.7/lib-src/sbsms/configure.in
-===================================================================
---- audacity-src-1.3.7.orig/lib-src/sbsms/configure.in
-+++ audacity-src-1.3.7/lib-src/sbsms/configure.in
-@@ -123,14 +123,6 @@ else
- fi
- AM_CONDITIONAL(ENABLE_PORTAUDIO, test x$enable_portaudio = xyes)
- 
--CXXFLAGS=`echo $CXXFLAGS | sed -e "s/-g//" -e "s/-O2//"`
--
--if test x$enable_debug = xyes; then
--   CXXFLAGS="$CXXFLAGS -g -O0"
--else
--   CXXFLAGS="$CXXFLAGS -O3 -fomit-frame-pointer"
--fi
--
- if test x$enable_static = xyes; then
-    CXXFLAGS="$CXXFLAGS"
- else
-Index: audacity-src-1.3.7/lib-src/sbsms/configure
-===================================================================
---- audacity-src-1.3.7.orig/lib-src/sbsms/configure
-+++ audacity-src-1.3.7/lib-src/sbsms/configure
-@@ -15359,14 +15359,6 @@ else
- fi
- 
- 
--CXXFLAGS=`echo $CXXFLAGS | sed -e "s/-g//" -e "s/-O2//"`
--
--if test x$enable_debug = xyes; then
--   CXXFLAGS="$CXXFLAGS -g -O0"
--else
--   CXXFLAGS="$CXXFLAGS -O3 -fomit-frame-pointer"
--fi
--
- if test x$enable_static = xyes; then
-    CXXFLAGS="$CXXFLAGS"
- else
diff --git a/media-sound/audacity/files/audacity-1.3.9-noflac.patch b/media-sound/audacity/files/audacity-1.3.9-noflac.patch
deleted file mode 100644
index 200282d3386a..000000000000
--- a/media-sound/audacity/files/audacity-1.3.9-noflac.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: m4/audacity_checklib_libflac.m4
-===================================================================
-RCS file: /cvsroot/audacity/audacity-src/m4/audacity_checklib_libflac.m4,v
-retrieving revision 1.2
-diff -u -r1.2 audacity_checklib_libflac.m4
---- m4/audacity_checklib_libflac.m4	20 Jan 2009 21:23:58 -0000	1.2
-+++ m4/audacity_checklib_libflac.m4	16 Sep 2009 20:15:47 -0000
-@@ -2,7 +2,7 @@
- dnl
- dnl Please increment the serial number below whenever you alter this macro
- dnl for the benefit of automatic macro update systems
--# audacity_checklib_libflac.m4 serial 1
-+# audacity_checklib_libflac.m4 serial 2
- 
- AC_DEFUN([AUDACITY_CHECKLIB_LIBFLAC], [
- 
-@@ -33,6 +33,8 @@
-       LIBFLAC_SYSTEM_AVAILABLE="yes"
-       LIBFLAC_SYSTEM_LIBS="-lFLAC++ -lFLAC"
-       LIBFLAC_SYSTEM_CPPSYMBOLS="USE_LIBFLAC"
-+      # this file shouldn't be built at if no libflac is available
-+      LIBFLAC_SYSTEM_OPTOBJS="ondemand/ODDecodeFlacTask.o"
-       AC_MSG_NOTICE([FLAC libraries are available as system libraries])
-    else
-       LIBFLAC_SYSTEM_AVAILABLE="no"
-@@ -58,6 +60,8 @@
-       LIBFLAC_LOCAL_CXXFLAGS="$LIBFLAC_LOCAL_CXXFLAGS -I\$(top_srcdir)/lib-src/libflac/include"
- 
-       LIBFLAC_LOCAL_CPPSYMBOLS="USE_LIBFLAC"
-+      # this file shouldn't be built at if no libflac is available
-+      LIBFLAC_LOCAL_OPTOBJS="ondemand/ODDecodeFlacTask.o"
-       LIBFLAC_LOCAL_CONFIG_SUBDIRS="lib-src/libflac"
- 	
-       AC_MSG_NOTICE([FLAC libraries are available in this source tree])
-Index: src/Makefile.in
-===================================================================
-RCS file: /cvsroot/audacity/audacity-src/src/Makefile.in,v
-retrieving revision 1.167
-diff -u -r1.167 Makefile.in
---- src/Makefile.in	17 Aug 2009 18:32:24 -0000	1.167
-+++ src/Makefile.in	16 Sep 2009 20:15:47 -0000
-@@ -194,7 +194,6 @@
- 	import/ImportRaw.o \
- 	import/RawAudioGuess.o \
- 	ondemand/ODComputeSummaryTask.o \
--	ondemand/ODDecodeFlacTask.o \
- 	ondemand/ODDecodeTask.o \
- 	ondemand/ODManager.o \
- 	ondemand/ODTask.o \