New upstream version; Resolves Bug #132280.

(Portage version: 2.1_pre10-r5)

4 files changed, 66 insertions, 1 deletions

diff --git a/app-emacs/emms/ChangeLog b/app-emacs/emms/ChangeLog
index 2061c13c8900..788e69da256b 100644
--- a/app-emacs/emms/ChangeLog
+++ b/app-emacs/emms/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/emms
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emms/ChangeLog,v 1.2 2006/01/22 01:15:07 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emms/ChangeLog,v 1.3 2006/05/15 04:11:44 mkennedy Exp $
+
+*emms-2.0 (15 May 2006)
+
+  15 May 2006; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/2.0-taglib-Makefile-gentoo.patch, +emms-2.0.ebuild:
+  New upstream version; Resolves Bug #132280.
 
   22 Jan 2006; Marien Zwart <marienz@gentoo.org> emms-1.0.20051204.ebuild:
   Fix typo ("mirro://" -> "mirror://").
diff --git a/app-emacs/emms/emms-2.0.ebuild b/app-emacs/emms/emms-2.0.ebuild
new file mode 100644
index 000000000000..c169d4fe3654
--- /dev/null
+++ b/app-emacs/emms/emms-2.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emms/emms-2.0.ebuild,v 1.1 2006/05/15 04:11:44 mkennedy Exp $
+
+inherit elisp toolchain-funcs eutils
+
+DESCRIPTION="EMMS is the Emacs Multimedia System"
+HOMEPAGE="http://www.gnu.org/software/emms/ http://www.emacswiki.org/cgi-bin/wiki/EMMS"
+SRC_URI="http://www.gnu.org/software/emms/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+IUSE=""
+
+RDEPEND="virtual/emacs"
+DEPEND="${RDEPEND}
+	sys-apps/texinfo"
+
+# EMMS can use almost anything for playing media files therefore the dependency
+# posibilities are so broad that we refrain from setting anything explicitly in
+# DEPEND/RDEPEND.
+
+S="${WORKDIR}/${P}"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${PV}-taglib-Makefile-gentoo.patch
+}
+
+src_compile() {
+	make CC="$(tc-getCC)" \
+		EMACS=emacs \
+		DESTDIR=/usr/share/emacs/site-lisp/emms \
+		all emms-print-metadata \
+		|| die
+}
+
+src_install() {
+	elisp-install emms *.{el,elc}
+	elisp-site-file-install ${FILESDIR}/50emms-gentoo.el
+	dodoc AUTHORS ChangeLog FAQ README RELEASE
+	doinfo *.info*
+	dobin *-wrapper emms-print-metadata
+}
diff --git a/app-emacs/emms/files/2.0-taglib-Makefile-gentoo.patch b/app-emacs/emms/files/2.0-taglib-Makefile-gentoo.patch
new file mode 100644
index 000000000000..519713f29acb
--- /dev/null
+++ b/app-emacs/emms/files/2.0-taglib-Makefile-gentoo.patch
@@ -0,0 +1,12 @@
+diff -ur emms-2.0.orig/Makefile emms-2.0/Makefile
+--- emms-2.0.orig/Makefile	2006-04-29 14:28:28.000000000 -0500
++++ emms-2.0/Makefile	2006-05-14 23:03:58.000000000 -0500
+@@ -41,7 +41,7 @@
+ 	makeinfo --html --no-split $<
+ 
+ emms-print-metadata: emms-print-metadata.c
+-	$(CC) -o $@ $< -I/usr/include/taglib -L/usr/lib -ltag_c
++	$(CC) -o $@ $< `taglib-config --libs --cflags` -ltag_c
+ 
+ install:
+ 	test -d $(SITELISP) || mkdir -p $(SITELISP)
diff --git a/app-emacs/emms/files/digest-emms-2.0 b/app-emacs/emms/files/digest-emms-2.0
new file mode 100644
index 000000000000..132f7b0d2568
--- /dev/null
+++ b/app-emacs/emms/files/digest-emms-2.0
@@ -0,0 +1,3 @@
+MD5 0f4d18438fbe95988e47634651617a4c emms-2.0.tar.gz 103740
+RMD160 966ea5d11d1d02332d09afe4ba661a395315008e emms-2.0.tar.gz 103740
+SHA256 3f6693ecffbf2aad123144a74f39fa0ca866690041d53836aa0a146db404e7b4 emms-2.0.tar.gz 103740