Version bump; fixes bug #184920.

(Portage version: 2.1.3_rc7)

5 files changed, 66 insertions, 9 deletions

diff --git a/app-emacs/emms/ChangeLog b/app-emacs/emms/ChangeLog
index 70b9d5eac2c4..79e511d415ab 100644
--- a/app-emacs/emms/ChangeLog
+++ b/app-emacs/emms/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emacs/emms
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emms/ChangeLog,v 1.9 2007/07/03 07:10:21 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emms/ChangeLog,v 1.10 2007/07/11 21:56:23 ulm Exp $
+
+  11 Jul 2007; Ulrich Mueller <ulm@gentoo.org> files/50emms-gentoo.el,
+  emms-2.1.ebuild, +emms-3.0.ebuild:
+  Version bump; Emacs 22 is needed now, updated SRC_URI, LICENSE changed to
+  GPL-3; fixes bug #184920. Use autoload mechanism in site-init file.
+
+*emms-3.0 (11 Jul 2007)
 
   03 Jul 2007; Christian Faulhammer <opfer@gentoo.org> emms-2.1.ebuild:
   added some quotes; adjusted DESCRIPTION; cleaned-up DEPEND; exchanged manual
diff --git a/app-emacs/emms/emms-2.1.ebuild b/app-emacs/emms/emms-2.1.ebuild
index 827f1aa8c2f7..eb3bea8ace93 100644
--- a/app-emacs/emms/emms-2.1.ebuild
+++ b/app-emacs/emms/emms-2.1.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emms/emms-2.1.ebuild,v 1.3 2007/07/03 07:10:21 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emms/emms-2.1.ebuild,v 1.4 2007/07/11 21:56:23 ulm Exp $
 
 inherit elisp toolchain-funcs eutils
 
 DESCRIPTION="The Emacs Multimedia System"
-HOMEPAGE="http://www.gnu.org/software/emms/ http://www.emacswiki.org/cgi-bin/wiki/EMMS"
+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 FDL-1.1"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
@@ -18,7 +20,7 @@ DEPEND="media-libs/taglib"
 # posibilities are so broad that we refrain from setting anything explicitly in
 # DEPEND/RDEPEND.
 
-S="${WORKDIR}/${P}"
+SITEFILE=50${PN}-gentoo.el
 
 src_unpack() {
 	unpack ${A}
@@ -29,14 +31,13 @@ src_unpack() {
 src_compile() {
 	emake CC="$(tc-getCC)" \
 		EMACS=emacs \
-		DESTDIR=$"{SITELISP}/${PN}" \
 		all emms-print-metadata \
 		|| die "emake failed"
 }
 
 src_install() {
-	elisp-install emms *.{el,elc}
-	elisp-site-file-install "${FILESDIR}/50emms-gentoo.el"
+	elisp-install ${PN} *.{el,elc}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	dodoc AUTHORS ChangeLog FAQ README RELEASE
 	doinfo *.info*
 	dobin *-wrapper emms-print-metadata
diff --git a/app-emacs/emms/emms-3.0.ebuild b/app-emacs/emms/emms-3.0.ebuild
new file mode 100644
index 000000000000..61a3a02e0f71
--- /dev/null
+++ b/app-emacs/emms/emms-3.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emms/emms-3.0.ebuild,v 1.1 2007/07/11 21:56:23 ulm Exp $
+
+NEED_EMACS=22
+
+inherit elisp toolchain-funcs eutils
+
+DESCRIPTION="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/download/${P}.tar.gz"
+
+LICENSE="GPL-3 FDL-1.1"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+IUSE=""
+
+DEPEND="media-libs/taglib"
+
+# 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.
+
+SITEFILE=50${PN}-gentoo.el
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/2.0-taglib-Makefile-gentoo.patch"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		EMACS=emacs \
+		all emms-print-metadata \
+		|| die "emake failed"
+}
+
+src_install() {
+	elisp-install ${PN} *.{el,elc}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	doinfo *.info*
+	dobin *-wrapper emms-print-metadata
+	dodoc AUTHORS ChangeLog FAQ NEWS README RELEASE || die "dodoc failed"
+}
diff --git a/app-emacs/emms/files/50emms-gentoo.el b/app-emacs/emms/files/50emms-gentoo.el
index d06a42dd77ab..ebbf55bd5063 100644
--- a/app-emacs/emms/files/50emms-gentoo.el
+++ b/app-emacs/emms/files/50emms-gentoo.el
@@ -1,5 +1,5 @@
 
-;;; site-lisp configuration for emms-cvs
+;;; emms site-lisp configuration
 
 (add-to-list 'load-path "@SITELISP@")
-(require 'emms)
+(require 'emms-auto)
diff --git a/app-emacs/emms/files/digest-emms-3.0 b/app-emacs/emms/files/digest-emms-3.0
new file mode 100644
index 000000000000..d94c22bc5b0c
--- /dev/null
+++ b/app-emacs/emms/files/digest-emms-3.0
@@ -0,0 +1,3 @@
+MD5 0ffb070394db0a8ca9152c66c72809c0 emms-3.0.tar.gz 200838
+RMD160 672eab126f21e3cd1ca2d1889e39668bf0b488bc emms-3.0.tar.gz 200838
+SHA256 5b750312dc82f856b1c725c0d795216f430ef7c25a301cda75b4847e52773594 emms-3.0.tar.gz 200838