New upstream version; Resolves Bug #132280.

Package-Manager: portage-2.1_pre10-r5

5 files changed, 100 insertions, 8 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/Manifest b/app-emacs/emms/Manifest
index 70decb99a8eb..759deed8b6b3 100644
--- a/app-emacs/emms/Manifest
+++ b/app-emacs/emms/Manifest
@@ -1,15 +1,42 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 97e8113e471656a996d0cc33cfeabdd8 ChangeLog 655
-MD5 fe4bbef3bfe6360099cebd745dd6d407 emms-1.0.20051204.ebuild 997
+AUX 2.0-taglib-Makefile-gentoo.patch 440 RMD160 9f27ab4f0dad8994af16da2bb6b86e3bb1d71f98 SHA1 5b3546fdee30c40a67d957245b67e5ff8e64c66c SHA256 2756285af4592f58ecc515cf1aa69b990a32a0d53a6bc095c197429765734ee5 size 440
+MD5 7c7baf6e1b26d4b2c0155ddf81328c82 files/2.0-taglib-Makefile-gentoo.patch 440
+RMD160 9f27ab4f0dad8994af16da2bb6b86e3bb1d71f98 files/2.0-taglib-Makefile-gentoo.patch 440
+SHA256 2756285af4592f58ecc515cf1aa69b990a32a0d53a6bc095c197429765734ee5 files/2.0-taglib-Makefile-gentoo.patch 440
+AUX 50emms-gentoo.el 97 RMD160 abc92989a433d284c0fdb4d94e127ef1aa69f77c SHA1 89b37acf198bc4a5b187345a482583b9ee89857d SHA256 a7493862aefafb7468ab6a236c8f1ffa41b77218da8a56b27625c352498947c9 size 97
 MD5 34171080a9948f732b10dd7fa79fe955 files/50emms-gentoo.el 97
-MD5 9d172cc2b77e763333794eb8a0cc1580 files/digest-emms-1.0.20051204 69
+RMD160 abc92989a433d284c0fdb4d94e127ef1aa69f77c files/50emms-gentoo.el 97
+SHA256 a7493862aefafb7468ab6a236c8f1ffa41b77218da8a56b27625c352498947c9 files/50emms-gentoo.el 97
+DIST emms-1.0.20051204.tar.bz2 68151 size 68151
+DIST emms-2.0.tar.gz 103740 RMD160 966ea5d11d1d02332d09afe4ba661a395315008e SHA256 3f6693ecffbf2aad123144a74f39fa0ca866690041d53836aa0a146db404e7b4 size 103740
+EBUILD emms-1.0.20051204.ebuild 997 RMD160 4990614661e066647c094a6e57f6bc2176d07a9a SHA1 d07d4c7d524afffc5f09f686bc520ddc56242c7b SHA256 b1abd99954a5b1cd990381c482197086f47c4d7568468b3a83c6a0afcbbb1f72 size 997
+MD5 fe4bbef3bfe6360099cebd745dd6d407 emms-1.0.20051204.ebuild 997
+RMD160 4990614661e066647c094a6e57f6bc2176d07a9a emms-1.0.20051204.ebuild 997
+SHA256 b1abd99954a5b1cd990381c482197086f47c4d7568468b3a83c6a0afcbbb1f72 emms-1.0.20051204.ebuild 997
+EBUILD emms-2.0.ebuild 1214 RMD160 2e1aeb25853df31665160857fad0f858491937ca SHA1 29b256550bf1653c9a01c06393e29a3f5158e86b SHA256 0079dd28a831db7fc1c57792d8265d9ac0f00de5f73495b4de1e88c2d71bfb5d size 1214
+MD5 bc59efac4f9f62dfb9388008c2fc2410 emms-2.0.ebuild 1214
+RMD160 2e1aeb25853df31665160857fad0f858491937ca emms-2.0.ebuild 1214
+SHA256 0079dd28a831db7fc1c57792d8265d9ac0f00de5f73495b4de1e88c2d71bfb5d emms-2.0.ebuild 1214
+MISC ChangeLog 842 RMD160 3d204747971c05ca83d3445b476a8cbe4d108104 SHA1 88d7a49e91b3c8f6ad5fdbe11c85dd65780a757b SHA256 48027145f44283d5a1fee7b99a3fea3ee34d46ef6a4280ff9f905c3eb7c9f3fd size 842
+MD5 154bb80a13555652fc6ffbf3c2fc424e ChangeLog 842
+RMD160 3d204747971c05ca83d3445b476a8cbe4d108104 ChangeLog 842
+SHA256 48027145f44283d5a1fee7b99a3fea3ee34d46ef6a4280ff9f905c3eb7c9f3fd ChangeLog 842
+MISC metadata.xml 680 RMD160 2fe42aefc7970bd6322f5a4ce5ff847d006de84a SHA1 5f745b07a9cc14ff4df5d8f7d85facc1a7f72d2d SHA256 622966d6cca0428984c0a6734dd42203cf0239204dec104bec843924cb1ab072 size 680
 MD5 cf758a93ae3acde4c9187fd43f18ce34 metadata.xml 680
+RMD160 2fe42aefc7970bd6322f5a4ce5ff847d006de84a metadata.xml 680
+SHA256 622966d6cca0428984c0a6734dd42203cf0239204dec104bec843924cb1ab072 metadata.xml 680
+MD5 9d172cc2b77e763333794eb8a0cc1580 files/digest-emms-1.0.20051204 69
+RMD160 a00b4dc01f1fb3e991f3944ab0020f0b046f2635 files/digest-emms-1.0.20051204 69
+SHA256 aba3a88c9a0772e3e12497c7c10e4365bc218ec20f044b8c1841a14e100466d7 files/digest-emms-1.0.20051204 69
+MD5 8cfb7803196b031893e04b5ce79c6bd7 files/digest-emms-2.0 226
+RMD160 9b99a023b3335d79d983dbee1c5cf3020166674e files/digest-emms-2.0 226
+SHA256 6a5ebf0fffe4683ee90cf03146885db07d4c13197303781821ff57a9d8fe64d2 files/digest-emms-2.0 226
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFD0tyrW78445TWHXcRAmTOAJ4nfxY7FPo/m1k+5kP+YkzmHnDZEgCdFlgH
-Dn/weWhkzewX3CU3ZlYs6ls=
-=4rNR
+iD8DBQFEZ/+HyiNZaEAZA+ARAkxMAJ9LW3RHEXO6iaYq5fcwoRkzyakhtgCff6EU
+D1Nx8/S3izYFUyQADEOkA30=
+=jLoI
 -----END PGP SIGNATURE-----
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