--- /usr/portage/media-libs/tunepimp/tunepimp-0.3.0.ebuild	2005-01-25 14:39:00.000000000 +0100
+++ tunepimp-0.4.0_pre4.ebuild	2005-02-01 10:53:36.376414528 +0100
@@ -4,13 +4,14 @@
 
 inherit eutils distutils perl-module
 
+MY_P=${P/_/-}
 DESCRIPTION="Client library to create MusicBrainz enabled tagging applications"
 HOMEPAGE="http://www.musicbrainz.org/products/tunepimp"
-SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/lib${P}.tar.gz"
+SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/picard/lib${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="flac mad oggvorbis readline python perl"
 
 RDEPEND="dev-libs/expat"
@@ -23,10 +24,11 @@
 	dev-util/pkgconfig
 	!media-sound/trm"
 
-S=${WORKDIR}/lib${P}
+S=${WORKDIR}/lib${MY_P}
 
 src_compile() {
-	epatch ${FILESDIR}/thread.patch
+	#the stock Makefile.am resulted in a sandbox violation
+	epatch ${FILESDIR}/Makefile.am.patch
 	econf || die "configure failed"
 	emake || die "emake failed"
 	if use perl; then