Revbump to include patch in bug #54089 provided by Joseph Turian <turian@gmail.com>. Added to ~sparc.

6 files changed, 112 insertions, 7 deletions

diff --git a/media-sound/yammi/ChangeLog b/media-sound/yammi/ChangeLog
index fa5556a642f3..378985cab43c 100644
--- a/media-sound/yammi/ChangeLog
+++ b/media-sound/yammi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/yammi
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/ChangeLog,v 1.16 2004/06/25 00:30:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/ChangeLog,v 1.17 2004/07/07 11:19:07 eradicator Exp $
+
+*yammi-1.0-r1 (07 Jul 2004)
+
+  07 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/yammi-1.0-traverse.patch, +yammi-1.0-r1.ebuild:
+  Revbump to include patch in bug #54089 provided by Joseph Turian
+  <turian@gmail.com>. Added to ~sparc.
 
   07 Jun 2004; Aron Griffis <agriffis@gentoo.org> yammi-0.8.2.ebuild,
   yammi-1.0.ebuild:
diff --git a/media-sound/yammi/Manifest b/media-sound/yammi/Manifest
index f87e61a5e9f2..df1e4cdee468 100644
--- a/media-sound/yammi/Manifest
+++ b/media-sound/yammi/Manifest
@@ -1,8 +1,11 @@
-MD5 c8b4059ad31687d029d75f4a9f5ea397 yammi-1.0.ebuild 2093
-MD5 2142d8919f8ca3840320e858dbf1c1c4 ChangeLog 2510
+MD5 bfbdf947fb0b6a5863b1c5563377bacc ChangeLog 2762
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 9406de17905c78a7d0f2f3393826c704 yammi-0.8.2.ebuild 2113
-MD5 3f815698af1d6b4efd7b6e08498cbef3 files/yammi-1.0-qt.patch 2173
+MD5 abafd63f559a06b2abdf27fb4770a3dc yammi-1.0.ebuild 2075
+MD5 30191c15441e584907c4827d0cce4a2c yammi-1.0-r1.ebuild 2136
+MD5 03f044ad1784731e428fc3751a8b212b files/digest-yammi-0.8.2 68
 MD5 9c22722989a753ad61b3b764925f252a files/digest-yammi-1.0 61
 MD5 0a437edbb0076d7d120eb70648c04fc3 files/yammi-0.8.2-qt.patch 1669
-MD5 03f044ad1784731e428fc3751a8b212b files/digest-yammi-0.8.2 68
+MD5 3f815698af1d6b4efd7b6e08498cbef3 files/yammi-1.0-qt.patch 2173
+MD5 dddb69fe8545cfaaf5c307b5bb80df75 files/yammi-1.0-traverse.patch 593
+MD5 9c22722989a753ad61b3b764925f252a files/digest-yammi-1.0-r1 61
diff --git a/media-sound/yammi/files/digest-yammi-1.0-r1 b/media-sound/yammi/files/digest-yammi-1.0-r1
new file mode 100644
index 000000000000..1449497dc0e5
--- /dev/null
+++ b/media-sound/yammi/files/digest-yammi-1.0-r1
@@ -0,0 +1 @@
+MD5 890923181d6d0f650790b004b2948864 yammi-1.0.tar.gz 928695
diff --git a/media-sound/yammi/files/yammi-1.0-traverse.patch b/media-sound/yammi/files/yammi-1.0-traverse.patch
new file mode 100644
index 000000000000..154af5663a1f
--- /dev/null
+++ b/media-sound/yammi/files/yammi-1.0-traverse.patch
@@ -0,0 +1,14 @@
+diff -ur yammi-1.0-old/yammi/yammimodel.cpp yammi-1.0/yammi/yammimodel.cpp
+--- yammi-1.0-old/yammi/yammimodel.cpp	2004-06-16 10:57:18.860199808 -0400
++++ yammi-1.0/yammi/yammimodel.cpp	2004-06-16 10:58:01.756678552 -0400
+@@ -642,6 +642,10 @@
+   d.setNameFilter(filePattern);
+ 	d.setSorting( QDir::Name );
+ 	const QFileInfoList* list = d.entryInfoList();
++	if (!list) {
++		cerr << "ERROR: Skipping directory " << path << "\n";
++		return true;
++	}
+ 	int filesToScan=list->count();
+ 	progress->setTotalSteps(filesToScan);
+ 	QFileInfoListIterator it( *list );								      // create list iterator
diff --git a/media-sound/yammi/yammi-1.0-r1.ebuild b/media-sound/yammi/yammi-1.0-r1.ebuild
new file mode 100644
index 000000000000..92101bac2119
--- /dev/null
+++ b/media-sound/yammi/yammi-1.0-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/yammi-1.0-r1.ebuild,v 1.1 2004/07/07 11:19:07 eradicator Exp $
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="MP3/Ogg/Wav-Manager and Jukebox 4 XMMS/Noatun"
+HOMEPAGE="http://yammi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/yammi/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~sparc"
+IUSE="cdr xmms oggvorbis kde"
+
+DEPEND=">=x11-libs/qt-3.1.0-r1
+	>=media-libs/id3lib-3.8.2
+	>=media-sound/cdparanoia-3.9.8
+	>=media-sound/lame-3.93.1
+	virtual/mpg123
+	>=media-sound/sox-12.17.3-r1
+	cdr? ( >=app-cdr/cdlabelgen-2.4.0 >=app-cdr/mp3burn-0.1 )
+	xmms? ( >=media-sound/xmms-1.2.7-r18 )
+	oggvorbis? ( >=media-libs/libvorbis-1.0-r1 >=media-sound/vorbis-tools-1.0-r1 )
+	kde? ( >=kde-base/kdebase-3.0.4 )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-qt.patch
+	epatch ${FILESDIR}/${P}-traverse.patch
+}
+
+src_compile() {
+	addpredict ${QTDIR}/etc/settings/
+
+	# 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-KDE --disable-noatun ${myconf}"
+
+	if ! use xmms && ! use kde
+	then
+		myconf="--disable-ogglibs ${myconf}"
+	else
+		use oggvorbis || myconf="--disable-oogvorbis ${myconf}"
+	fi
+
+	econf ${myconf} || die "./configure failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=$D install || die
+	dodoc AUTHORS CHANGELOG CREDITS INSTALL README TODO
+}
+
+pkg_postinst() {
+	if ! use kde && ! use xmms
+	then
+		ewarn "Yammi is compiled without support for xmms and noatun."
+		ewarn "Now the functionality of Yammi is very limited."
+		ewarn "It is highly recommended to recompile Yammi."
+		ewarn
+		ewarn "To get xmms support:"
+		ewarn "$ export USE=\"xmms\""
+		ewarn
+		ewarn "To get noatun support:"
+		ewarn "$ export USE=\"kde\""
+		ewarn
+		ewarn "Or to get support for both:"
+		ewarn "$ export USE=\"xmms kde\""
+	fi
+}
diff --git a/media-sound/yammi/yammi-1.0.ebuild b/media-sound/yammi/yammi-1.0.ebuild
index fbbb45c18a87..a8e9a7f08728 100644
--- a/media-sound/yammi/yammi-1.0.ebuild
+++ b/media-sound/yammi/yammi-1.0.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/yammi-1.0.ebuild,v 1.8 2004/06/25 00:30:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/yammi-1.0.ebuild,v 1.9 2004/07/07 11:19:07 eradicator Exp $
 
 inherit flag-o-matic eutils
 
 DESCRIPTION="MP3/Ogg/Wav-Manager and Jukebox 4 XMMS/Noatun"
 HOMEPAGE="http://yammi.sourceforge.net/"
 SRC_URI="mirror://sourceforge/yammi/${P}.tar.gz"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"