Version bump; fixes bug #184920.

Package-Manager: portage-2.1.3_rc7

6 files changed, 89 insertions, 24 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/Manifest b/app-emacs/emms/Manifest
index 6ab7ec96ae6f..2d1443d69a06 100644
--- a/app-emacs/emms/Manifest
+++ b/app-emacs/emms/Manifest
@@ -5,19 +5,24 @@ AUX 2.0-taglib-Makefile-gentoo.patch 440 RMD160 9f27ab4f0dad8994af16da2bb6b86e3b
 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
-MD5 34171080a9948f732b10dd7fa79fe955 files/50emms-gentoo.el 97
-RMD160 abc92989a433d284c0fdb4d94e127ef1aa69f77c files/50emms-gentoo.el 97
-SHA256 a7493862aefafb7468ab6a236c8f1ffa41b77218da8a56b27625c352498947c9 files/50emms-gentoo.el 97
+AUX 50emms-gentoo.el 94 RMD160 baa9941e03f39b1f46195b155408fb96311481bb SHA1 1819e4e0f8a48e05740ab2e3579c5a9dac680f6b SHA256 cb8374bf3d0cd7fbff60c73338e8d0752e738b156f8f8f0242b23bebe02a395c
+MD5 39a17a85f7caa95693709f7aeadeb466 files/50emms-gentoo.el 94
+RMD160 baa9941e03f39b1f46195b155408fb96311481bb files/50emms-gentoo.el 94
+SHA256 cb8374bf3d0cd7fbff60c73338e8d0752e738b156f8f8f0242b23bebe02a395c files/50emms-gentoo.el 94
 DIST emms-2.1.tar.gz 147749 RMD160 d919c1dbcad312f6fa6526b0b0af52e828832b0d SHA1 54f8b9180a3b00e972c1388f6cf88cedf57e8599 SHA256 17028f50ac36038191e41fda1ff2e739343ac3e50c560c395790046a2bdd6437
-EBUILD emms-2.1.ebuild 1193 RMD160 f2cb232f9378fb176f2018afb15c6fe7074ab0e5 SHA1 f40a39a5b7cf7f08e8b4b97e600d970b97c110d4 SHA256 d8f8212d7b90665191dbea9f7497956ccb9ac075b18b98ecd10f998521dadbcf
-MD5 79b58dee1ce2b3584c36eee148f2d37b emms-2.1.ebuild 1193
-RMD160 f2cb232f9378fb176f2018afb15c6fe7074ab0e5 emms-2.1.ebuild 1193
-SHA256 d8f8212d7b90665191dbea9f7497956ccb9ac075b18b98ecd10f998521dadbcf emms-2.1.ebuild 1193
-MISC ChangeLog 1549 RMD160 5e6813d244b20b6c47e80288cc8fddc81bad7819 SHA1 39735aee983534dbb2e77a2414be85655d299e4e SHA256 8bc1d3f8082906e41ac7f1e0d88fe2d8feb5bf317ad53c5314575200567e7cc1
-MD5 33bfbb1ed041d3ad129524c8fdc1892a ChangeLog 1549
-RMD160 5e6813d244b20b6c47e80288cc8fddc81bad7819 ChangeLog 1549
-SHA256 8bc1d3f8082906e41ac7f1e0d88fe2d8feb5bf317ad53c5314575200567e7cc1 ChangeLog 1549
+DIST emms-3.0.tar.gz 200838 RMD160 672eab126f21e3cd1ca2d1889e39668bf0b488bc SHA1 d1317227e8d9d2e80d6bd9f2938fcf636d112e2d SHA256 5b750312dc82f856b1c725c0d795216f430ef7c25a301cda75b4847e52773594
+EBUILD emms-2.1.ebuild 1164 RMD160 fb7600765262683ab34a374eab2c924468fd2503 SHA1 764f8a9c854990b1a97f1056f74b74728354b850 SHA256 94fe8857986cc4042911b8eaeb7c9400c8b0400b63da3b1aee149192cf92d259
+MD5 6d142af9eeca6af3fdcecebe428c2bfa emms-2.1.ebuild 1164
+RMD160 fb7600765262683ab34a374eab2c924468fd2503 emms-2.1.ebuild 1164
+SHA256 94fe8857986cc4042911b8eaeb7c9400c8b0400b63da3b1aee149192cf92d259 emms-2.1.ebuild 1164
+EBUILD emms-3.0.ebuild 1206 RMD160 1b972334eacc24d2aad62831b23af6a7bcbdd92a SHA1 062cc8146829ec50c33513a95a74193bef900718 SHA256 c9be794de6ebc44e35d3089571cfa5a0206e3cc11df51f3235573b85e82331a5
+MD5 22a1b3be5356bf49e3e6ad2370d19cba emms-3.0.ebuild 1206
+RMD160 1b972334eacc24d2aad62831b23af6a7bcbdd92a emms-3.0.ebuild 1206
+SHA256 c9be794de6ebc44e35d3089571cfa5a0206e3cc11df51f3235573b85e82331a5 emms-3.0.ebuild 1206
+MISC ChangeLog 1828 RMD160 28d3c082d5ee3ec0a9f1d825072e143968a3df72 SHA1 78f7333c5ce0d33972edc7f60fd8ad0adc9c6e7e SHA256 866d2d5ddeb690f14cfd75d167e0a971031068d9ca0ed5adba15588670d9fd95
+MD5 e016b9b33ef2b00208d6d97fe2690f28 ChangeLog 1828
+RMD160 28d3c082d5ee3ec0a9f1d825072e143968a3df72 ChangeLog 1828
+SHA256 866d2d5ddeb690f14cfd75d167e0a971031068d9ca0ed5adba15588670d9fd95 ChangeLog 1828
 MISC metadata.xml 680 RMD160 2fe42aefc7970bd6322f5a4ce5ff847d006de84a SHA1 5f745b07a9cc14ff4df5d8f7d85facc1a7f72d2d SHA256 622966d6cca0428984c0a6734dd42203cf0239204dec104bec843924cb1ab072
 MD5 cf758a93ae3acde4c9187fd43f18ce34 metadata.xml 680
 RMD160 2fe42aefc7970bd6322f5a4ce5ff847d006de84a metadata.xml 680
@@ -25,10 +30,13 @@ SHA256 622966d6cca0428984c0a6734dd42203cf0239204dec104bec843924cb1ab072 metadata
 MD5 86788e645b00c1e4e69eaf3cb389674f files/digest-emms-2.1 226
 RMD160 85ede804d056495d8f88d23198c141801cafbab1 files/digest-emms-2.1 226
 SHA256 09dda4f015488cd3749e3f0234b6c17c7a8ed0881e39c1ca6350f16f14083028 files/digest-emms-2.1 226
+MD5 be54ad01f39bb783c1e286e666d1975f files/digest-emms-3.0 226
+RMD160 5d60ca292109e27915666e8ceb4876beb4859312 files/digest-emms-3.0 226
+SHA256 e29f9214c68337bfb1f1d20ce996aefb5ae3bc8f44270bf637bc27a22c9d270d files/digest-emms-3.0 226
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGifZjNQqtfCuFneMRAro3AJ9ItspHo8BCw3vLgXbV9lqfc1KrQACfb+zF
-dpD3n9WvD0yZNgAK0tOyP1M=
-=Bg1x
+iD8DBQFGlVIHOeoy/oIi7uwRAoTAAJ9WQsDTe0t8c5c1x9IbClLn8LcivACfdZJ3
+PUo04k3Gl0Wot/hFcsNSaWg=
+=nADA
 -----END PGP SIGNATURE-----
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