Version bump and clean up (~x86 masked)

6 files changed, 12 insertions, 43 deletions

diff --git a/media-sound/yammi/Manifest b/media-sound/yammi/Manifest
index bdb72e13e12f..8e936ae2840a 100644
--- a/media-sound/yammi/Manifest
+++ b/media-sound/yammi/Manifest
@@ -1,3 +1,3 @@
-MD5 f1e536882bdadbd2e879b7b8dbed3ef1 ChangeLog 908
+MD5 58b69320dc1f2630b89e17e4ae5e9e45 ChangeLog 908
 MD5 4ed4f517f85716ffd28205a13de79556 yammi-0.8.2.ebuild 2150
 MD5 03f044ad1784731e428fc3751a8b212b files/digest-yammi-0.8.2 68
diff --git a/media-sound/yammi/files/digest-yammi-0.7 b/media-sound/yammi/files/digest-yammi-0.7
deleted file mode 100644
index c17fa307a0ff..000000000000
--- a/media-sound/yammi/files/digest-yammi-0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ca0bd2774675e5f4b57357e6cd71d115 yammi-0.7.tar.gz 764125
diff --git a/media-sound/yammi/files/digest-yammi-0.8.1 b/media-sound/yammi/files/digest-yammi-0.8.1
deleted file mode 100644
index aac24c8d805c..000000000000
--- a/media-sound/yammi/files/digest-yammi-0.8.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a50c9b93d437d113ce72a182d6a6bc94 yammi-0.8.1.tar.gz 792642
diff --git a/media-sound/yammi/files/digest-yammi-0.8.2 b/media-sound/yammi/files/digest-yammi-0.8.2
new file mode 100644
index 000000000000..b8b39391dedd
--- /dev/null
+++ b/media-sound/yammi/files/digest-yammi-0.8.2
@@ -0,0 +1 @@
+MD5 abaaa7a0b04fbb9a348334f5b496d76e yammi-0.8.2fixed.tar.gz 800254
diff --git a/media-sound/yammi/yammi-0.7.ebuild b/media-sound/yammi/yammi-0.7.ebuild
deleted file mode 100644
index c6e9d1756c74..000000000000
--- a/media-sound/yammi/yammi-0.7.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/yammi-0.7.ebuild,v 1.1 2003/03/15 07:04:16 jje Exp $
-
-S="${WORKDIR}/${P}"
-
-DESCRIPTION="MP3/Ogg/Wav-Manager and Jukebox 4 XMMS/Noatun"
-SRC_URI="mirror://sourceforge/yammi/${P}.tar.gz"
-HOMEPAGE="http://yammi.sf.net"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-DEPEND=">=x11-libs/qt-3.1.0-r1
-	>=media-sound/xmms-1.2.7-r18
-	>=media-libs/id3lib-3.8.2
-	>=media-libs/libvorbis-1.0-r1
-	>=media-sound/mpg123-0.59r-r1
-	>=media-sound/cdparanoia-3.9.8
-	>=media-sound/lame-3.93.1
-	>=app-cdr/mp3burn-0.1
-	>=app-cdr/cdlabelgen-2.4.0"
-
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-	
-	make || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS CHANGELOG CREDITS INSTALL README TODO
-}
diff --git a/media-sound/yammi/yammi-0.8.1.ebuild b/media-sound/yammi/yammi-0.8.2.ebuild
index ed787fb656b5..6b6391960b5d 100644
--- a/media-sound/yammi/yammi-0.8.1.ebuild
+++ b/media-sound/yammi/yammi-0.8.2.ebuild
@@ -9,7 +9,7 @@ inherit flag-o-matic
 S="${WORKDIR}/${P}"
 
 DESCRIPTION="MP3/Ogg/Wav-Manager and Jukebox 4 XMMS/Noatun"
-SRC_URI="mirror://sourceforge/yammi/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/yammi/${P}fixed.tar.gz"
 HOMEPAGE="http://yammi.sf.net"
 
 LICENSE="GPL-2"
@@ -29,10 +29,17 @@ DEPEND=">=x11-libs/qt-3.1.0-r1
 	>=vorbis-tools-1.0-r1 )
 	kde? ( >=kde-base/kde-3.0.4 )"
 
+src_unpack() {
+	unpack ${P}fixed.tar.gz
+}
+
 src_compile() {
 	# need to filter -fomit-frame-pointer for pentium II
 	is-flag "-march=pentium2" && filter-flags "-fomit-frame-pointer"
-
+	
+	#needed to let configure detect the id3libs correct
+	export LDFLAGS="-lstdc++"
+	
 	local myconf
 	use xmms || myconf="--disable-xmms"
 	use kde || myconf="--disable-noatun ${myconf}"
@@ -76,3 +83,4 @@ pkg_postinst() {
 	fi
 }
 
+