--- /usr/portage/app-cdr/k3b/k3b-0.11.20.ebuild	2005-02-22 21:36:51.000000000 +0100
+++ k3b-0.11.20.ebuild	2005-02-23 18:51:57.789493760 +0100
@@ -1,25 +1,27 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.11.20.ebuild,v 1.3 2005/02/22 20:14:40 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.11.20.ebuild,v 1.1 2005/02/04 16:32:33 carlo Exp $
 
 inherit kde eutils
 
 DESCRIPTION="K3b, KDE CD Writing Software"
 HOMEPAGE="http://www.k3b.org/"
-SRC_URI="mirror://sourceforge/k3b/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/k3b/${P}.tar.bz2
+	mirror://gentoo/k3b-hicolor-icons.tar.bz2"
 
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE="arts dvdr encode flac kde mad oggvorbis"
+IUSE="arts dvdr encode flac kde mad oggvorbis id3lib libsamplerate resmgr"
 
 DEPEND="arts? ( kde-base/arts )
 	kde? ( || ( kde-base/kdesu kde-base/kdebase ) )
-	media-libs/libsamplerate
+	libsamplerate? ( media-libs/libsamplerate )
 	>=media-sound/cdparanoia-3.9.8
-	>=media-libs/id3lib-3.8.0_pre2
+	id3lib? ( >=media-libs/id3lib-3.8.0_pre2 )
 	flac? ( <media-libs/flac-1.1.2 )
 	mad? ( media-libs/libmad )
-	oggvorbis? ( media-libs/libvorbis )"
+	oggvorbis? ( media-libs/libvorbis )
+	resmgr? ( sys-apps/resmgr )"
 RDEPEND="${DEPEND}
 	virtual/cdrtools
 	>=app-cdr/cdrdao-1.1.7-r3
@@ -51,6 +53,8 @@
 src_unpack() {
 	kde_src_unpack
 	epatch ${FILESDIR}/k3b-0.11.17-noarts.patch
+	epatch ${FILESDIR}/${P}-without-switches.patch
+	cp ${WORKDIR}/src/icons/*.png ${S}/src/icons/
 
 	make -f admin/Makefile.common || die
 }
@@ -58,10 +62,12 @@
 src_compile() {
 	local _S=${S}
 	local myconf="--enable-libsuffix= $(use_with kde k3bsetup) \
-		--with-external-libsamplerate"
-
-	# it is important to disable flac for bug #82558.
-	use flac || export ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_process_single="no"
+		$(use_with libsamplerate external-libsamplerate) \
+		$(use_with oggvorbis) \
+		$(use_with mad libmad) \
+		$(use_with flac) \
+		$(use_with id3lib) \
+		$(use_with resmgr) "
 
 	# Build process of K3B
 	kde_src_compile
@@ -93,8 +99,6 @@
 		mv ${D}/usr/share/applnk/Settings/System/k3bsetup2.desktop ${D}/usr/share/applications
 	fi
 	rm -fR ${D}/usr/share/applnk/
-	dodir /usr/share/pixmaps
-	cp ${D}/usr/share/icons/crystalsvg/32x32/apps/k3b.png ${D}/usr/share/pixmaps/
 }
 
 pkg_postinst() {