--- /usr/portage/media-sound/audacity/audacity-1.2.3-r1.ebuild	2005-09-17 21:06:14.000000000 +0100
+++ audacity-1.2.4.ebuild	2005-12-02 23:25:27.000000000 +0000
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.2.3-r1.ebuild,v 1.3 2005/09/17 19:45:35 halcy0n Exp $
+# $Header: $
 
 inherit wxwidgets eutils
 
-IUSE="gtk2 encode flac mad oggvorbis libsamplerate"
+IUSE="gtk2 encode mad ogg vorbis"
 
 MY_PV="${PV/_/-}"
 MY_P="${PN}-src-${MY_PV}"
@@ -22,23 +22,15 @@
 
 DEPEND="=x11-libs/wxGTK-2.4*
 	>=app-arch/zip-2.3
-	>=media-libs/id3lib-3.8.0
 	media-libs/libid3tag
 	>=media-libs/libsndfile-1.0.0
-	libsamplerate? ( >=media-libs/libsamplerate-0.0.14 )
-	>=media-libs/ladspa-sdk-1.12
-	flac? ( media-libs/flac )
-	oggvorbis? ( >=media-libs/libvorbis-1.0 )
+	ogg? ( >=media-libs/libvorbis-1.0 )
+	vorbis? ( >=media-libs/libvorbis-1.0 )
 	mad? ( media-libs/libmad )
 	encode? ( >=media-sound/lame-3.92 )"
 
 WX_GTK_VER="2.4"
 
-src_unpack() {
-	unpack "${A}"
-	epatch "${FILESDIR}"/${P}-x86.patch #bug #73248
-}
-
 src_compile() {
 	if ! use gtk2; then
 		need-wxwidgets gtk || die "No gtk1 version of x11-libs/wxGTK found"
@@ -46,11 +38,14 @@
 		need-wxwidgets gtk2 || die "No gtk2 version of x11-libs/wxGTK found"
 	fi
 
+	filter-flags "-fPIC"
+	filter-flags "-fpic"
+
 	econf \
 		$(use_with mad libmad system) \
-		$(use_with oggvorbis vorbis system) \
-		$(use_with flac libflac system) \
-		$(use_with libsamplerate system) \
+		$(use_with ogg vorbis system) \
+		$(use_with vorbis vorbis system) \
+		--without-flac \
 		--with-id3tag=system \
 		--with-libsndfile=system \
 		${myconf} || die