Fix build failure with texinfo-5.1, bug 464308. Update EAPI. Specify LICENSE more precisely. Remove old.

Package-Manager: portage-2.1.11.60/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

6 files changed, 51 insertions, 90 deletions

diff --git a/app-emacs/emms/ChangeLog b/app-emacs/emms/ChangeLog
index 4117a102416e..06963ec969df 100644
--- a/app-emacs/emms/ChangeLog
+++ b/app-emacs/emms/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/emms
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emms/ChangeLog,v 1.14 2010/08/09 20:19:30 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emms/ChangeLog,v 1.15 2013/04/03 20:54:16 ulm Exp $
+
+  03 Apr 2013; Ulrich Müller <ulm@gentoo.org>
+  -files/2.0-taglib-Makefile-gentoo.patch, -emms-3.0.ebuild,
+  emms-3.0-r1.ebuild, +files/emms-3.0-texinfo-5.patch:
+  Fix build failure with texinfo-5.1, bug 464308. Update EAPI. Specify LICENSE
+  more precisely. Remove old.
 
 *emms-3.0-r1 (09 Aug 2010)
 
diff --git a/app-emacs/emms/Manifest b/app-emacs/emms/Manifest
index d84425094e1d..606a1dae8dec 100644
--- a/app-emacs/emms/Manifest
+++ b/app-emacs/emms/Manifest
@@ -1,28 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 2.0-taglib-Makefile-gentoo.patch 440 SHA256 2756285af4592f58ecc515cf1aa69b990a32a0d53a6bc095c197429765734ee5 SHA512 793cb93b986d8b61fdb5f47a3d4f49da0de5cb87c6d4b25c2606eb968495409140022db20fc4afc5c11ffe023e1c708f9f5e611f71e5be3ddd319e3288beee12 WHIRLPOOL 42e20e08ede3df8218cbfb368fde80f45d65b29211069dcdf8383795c3a174e6f50972e733d8335e0fd10e9bf21867fccdf4b5f412f6de83ad3caceeb26d05d1
 AUX 50emms-gentoo.el 59 SHA256 86d464acaafdf27649e81518af8e1d5b4e6399e8a3543de91f9d13bd7460770b SHA512 e1dcdf700ec405915ecc67dbca29b89468ab16b413cfa9ae5910481036db4627609939a7142d1d58f4f66464f12af02722750e24b25513a265be66c0943f7c66 WHIRLPOOL d019ac75c25bdd83a9c57acb24dabffd21b810cf1f7a057409de90d5760eb16d3b9fc988e7446342e9cafea7e6f428a4a1918a0006526374c9fce3beb2d949bc
 AUX emms-3.0-Makefile.patch 411 SHA256 ebe4382a43691108479a256da3e8718acec2187975e4f7870e9c50d85ddba109 SHA512 6e659103419d6d9ed5129cc48b670d0bb54389dc339258addb39b7590043a95c80af401a4eed55e96a2872145cc16e7654f6b263112db97be3f158c13c9bbd81 WHIRLPOOL 6b4bc66eef5f48c1048e07bc9803bcaedb080e010e042e30a75c987083e4044aab3ae3e9ee2e6da8765b5b9b6ef47c2d6e4687cb5a0014103045d725802a1c30
+AUX emms-3.0-texinfo-5.patch 509 SHA256 66ddbc99b6fb938955f30dee1f1c7cd26939cc9306ecfc8d77dcefbc4ebe176b SHA512 bce004eff25f371507b38b7176873c0d54fe28e873431a4ff4a714523912dcc07a7284a2527c9751f77ab0260ee4ca76e63557df4dc02fe8eb06537d5b750178 WHIRLPOOL 4ba671116c56b8895cd332c5c734582e935c4581d31d7f26581ba60bf237f6b0b592cabe5bfb18665ea8a23523dd33e645d73970333c4bec6ed6e6fc41da76d4
 DIST emms-3.0.tar.gz 200838 SHA256 5b750312dc82f856b1c725c0d795216f430ef7c25a301cda75b4847e52773594 SHA512 a6637d6d9bcf7fdc81815e698b51579d2dcb51b70b39d65117a81d180541f4774c82a1da23f5e67a5ffd37d5f1a4ce4fe5f653f8e443f899910320eaf5420119 WHIRLPOOL b8f9eecf1c1883e59051a31076888abb038627960012c22d9822764d558e84d97afb0b3eee9c6bf3fe89b707c6657d62099b384cac684709f1250f8fe63e9c59
-EBUILD emms-3.0-r1.ebuild 1158 SHA256 d6c7bbc854fad80cc47028d50766ef62fd18f1aece1010009fc44e7c8a88d3a1 SHA512 91b49da8530de1260db4856a675a095a3398bb1bb9bc44ed5e717e480a591053d70ab323bbee43279c7b6c5c2798763e16dc99bd8f330df96ea72c3862abae85 WHIRLPOOL 0f78b8fabdb299d347149472da546d934af774feb939a7f315e828ffe1d0aeb1910a82732ef2ceaba03645bf6617e2fbae370bb97f128e7ae62fddada392a5ad
-EBUILD emms-3.0.ebuild 1229 SHA256 22abc49e99f647d43bd67d33a383830b2c2c270af7bca734b34a8666aa60b8d9 SHA512 4ec1a51355173e1a128481c044e7c5d13ade1ea325b8482a6540da7c76e62c5afd29170561dc995f8798adc5f18aac83edf8fd6dc80b8930728c2fecf51cc16f WHIRLPOOL 57aeb6d07bf435738540db31072ff68caff79c7375516be3b6e6101aff973974f5a030a5cb69c842add804703b0f081897b38533b39d02ce919473344fc6b6c2
-MISC ChangeLog 2188 SHA256 a46c01da7e2997a63b68b2cb9b75607f51d8659e9ab219f59b462c2b8d177d42 SHA512 ab44a0df57da197a7d825fd40b432284e861382a562331bd5dd9764ab53d9abcefd78236fe5a672de4725db65483d4fea31964234dd03bba62417dff8f55b014 WHIRLPOOL a85450ed4d892a147ee270c0d49fba1bad0a53d8fcf1f61dbc3d024cefda833c492bd9c95926372ab83926c7d77bc3b17a9a0b2a97ff4bc07825b7c04ef96307
+EBUILD emms-3.0-r1.ebuild 1139 SHA256 0d29032d669ff58fd6a7ebf3e77632e51384aa7154ff6f641b522f953e018d59 SHA512 dc40781707b2dedb7f3683528595a6be9fc78f32fb99c632b753ab76237668458363eb40b95f9a4c495d3e4db4006eea79df4061f0f04c33a2d0d38c8d3748ae WHIRLPOOL 411b195edd66b179f540d81adfc23af0de79ab7378e0c367bd23e39c5ac2c944e93b82281ba3ba8d613cb4da802a6e72feb49a2a689b88121caf841d1f6adefb
+MISC ChangeLog 2461 SHA256 c89408ad57ebb17b7c416abfbcb9dbac47bc6ee1d630031f61df8957029fd4e4 SHA512 32020ab60093e0751d2e0ba8e3925e2991f13b5dcc1a1c838774a1a3960d0791c8933d99d646d441cf4f692e5751aa69c80b0ee553b17fd4098e7fbd53a233ad WHIRLPOOL 28c7abf0e6b7c49411ab01a6f096cf3751dd1d9d6de260bfbb689bba049a567eb120dbc5a02043cf3ddc8891c09a1d2040e6035544a911e03b3ec34759bc7c8f
 MISC metadata.xml 680 SHA256 622966d6cca0428984c0a6734dd42203cf0239204dec104bec843924cb1ab072 SHA512 9fb74c6a27d7482a58846b0a5b6d7374cfbf56de583ede9d42a815a65ee2be1b45b8bf3bafec466d56d91873415df0391601357f110db52a89ef8a8438684833 WHIRLPOOL c0a460f5b5885700eedb2506d6a5e65b18823862628e47ee3c84d44ffd9fe7f2e0ae735d740f706a7adab40a05c112cd1f4c4e1ac344df05e71e315b9563d601
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP9e3vAAoJEDxpGckxwJCBrjIP/1p3f2gszycufbTw/HxVEv+W
-SOlymU/1AT6zh5UX6eAN9R6MCcMKdj97rfFpjgPWQ08Kmsjl2XChuzEofK+ZzoKE
-tzMvnILML+oBsSpl7Yx/xrFLAI8WHbpK2j8Q+0QkdFsyhoLqPjYdbeobTLuYwUSz
-EEY0KVBiM/KEWEDR8AUsbpBsaocZWIX43HxpHAkLOmu59KqlX8gDuHGHKtyN+1mT
-ceGy/Cd68Q7dCl2z/8emXaChIqQ/+qON5vWeU6MWhmayEil+KU7p8m7A4meMmQyL
-QPsoBbAaY3Tn94v4lYsrgulFQZ3lOaLqdfkMyeia1afcY3YhLlnpB75qniTqvU2u
-dmK8ym48Sj/04d/Zqf5wm/DH9PdnJIRcgrT5aF1/qaPV+vW37WNdPDlFd/PFzw2V
-TvBLwOcr1aREnULkOsHMnWQUX9DgycZ6h1cJ1BGFPm9WfW/qDqU/b9x+dKfJZ0SP
-Sl/6ovbKWczukZWwOgoGFaMIBlgsIhgm6NCj9xpLdF/7C3HiOByq7cmLcU9krd7Y
-4WpTpdjNE+hSD8IULgi5D69LUNwLFeb6Po0Azz9qs1BSGHVaRlodPqAEf/7Dusmt
-4ojFSDZCG8bY49iz7uqXMBIo5OPP6rj9sVfWbtO1rgLgcX6NkdgCo2Lt+RuGR3Ht
-MPXwYT6siqqOBUoLZ2TV
-=oH9V
+iQGcBAEBCAAGBQJRXJcgAAoJEJQzkH1pP7W4KVkL/0Tf550WzVSyHi6iv/F4nN1K
+jMNyiYW70PfyVtYXGO4FbQxvgVAF0F1XjGyvcheLCZYXwvIJR6/EhI9S2fIqbrHn
+gzon3wWfvP2IHx2BymTVTKViDJK9xs9S/Ka1rxHEAduBpfmMEu/b7Z32YYabiRqt
+X7A5eDIE8OwQTAGLI3YlFwF6fSKB1ZPMT4etx0ru15D2S+fZ+/jtQ3WeJYlWmnJW
+DVzQrdiN+l00j8unHUDwPipREIqBqpOj9WY4+PZPy2S7SKfMo+532TKg78MDLZ1O
+5QnOXP5J1q9d8vLB0LveHARNhAhUjjlX04ctmxwz5EmcyWUnl8J/b/TzqRO3CRvy
+TgBJoqp9iNzA1AAzLvftEphxVAYNDXWMPuwCTgFwVHP9b+jfEDVx9E/NfchaGhSM
+LsH6g6aw5qiYuhOcCuP5n662m07s+1Yle3/DjsPrC+/XZHWoNSLTccI0ObXAaDtf
+XJRCs8dpBtSUVEtp8efnZyIMGHwOp6sDzEZrt0JDmw==
+=4eEn
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/emms/emms-3.0-r1.ebuild b/app-emacs/emms/emms-3.0-r1.ebuild
index 6b506c76f1c1..16d076203a84 100644
--- a/app-emacs/emms/emms-3.0-r1.ebuild
+++ b/app-emacs/emms/emms-3.0-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emms/emms-3.0-r1.ebuild,v 1.1 2010/08/09 20:19:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emms/emms-3.0-r1.ebuild,v 1.2 2013/04/03 20:54:16 ulm Exp $
 
+EAPI=5
 NEED_EMACS=22
 
 inherit elisp toolchain-funcs
@@ -11,10 +12,9 @@ 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"
+LICENSE="GPL-3+ FDL-1.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
 
 DEPEND="media-libs/taglib"
 RDEPEND="${DEPEND}"
@@ -23,19 +23,20 @@ RDEPEND="${DEPEND}"
 # possibilities are so broad that we refrain from setting anything explicitly
 # in DEPEND/RDEPEND.
 
-ELISP_PATCHES="${P}-Makefile.patch"
+ELISP_PATCHES="${P}-Makefile.patch
+	${P}-texinfo-5.patch"
 SITEFILE="50${PN}-gentoo.el"
 
 src_compile() {
 	emake CC="$(tc-getCC)" \
 		EMACS=emacs \
-		all emms-print-metadata || die
+		all emms-print-metadata
 }
 
 src_install() {
-	elisp-install ${PN} *.{el,elc} || die
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	doinfo *.info* || die
-	dobin *-wrapper emms-print-metadata || die
-	dodoc AUTHORS ChangeLog FAQ NEWS README RELEASE || die
+	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
 }
diff --git a/app-emacs/emms/emms-3.0.ebuild b/app-emacs/emms/emms-3.0.ebuild
deleted file mode 100644
index e05381efab7b..000000000000
--- a/app-emacs/emms/emms-3.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2009 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.3 2009/05/05 07:55:53 fauli 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"
-RDEPEND="${DEPEND}"
-
-# EMMS can use almost anything for playing media files therefore the dependency
-# possibilities 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/2.0-taglib-Makefile-gentoo.patch b/app-emacs/emms/files/2.0-taglib-Makefile-gentoo.patch
deleted file mode 100644
index 519713f29acb..000000000000
--- a/app-emacs/emms/files/2.0-taglib-Makefile-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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/emms-3.0-texinfo-5.patch b/app-emacs/emms/files/emms-3.0-texinfo-5.patch
new file mode 100644
index 000000000000..10ee2ad57524
--- /dev/null
+++ b/app-emacs/emms/files/emms-3.0-texinfo-5.patch
@@ -0,0 +1,17 @@
+--- emms-3.0-orig/gpl.texi
++++ emms-3.0/gpl.texi
+@@ -659,6 +659,8 @@
+ Program, unless a warranty or assumption of liability accompanies a
+ copy of the Program in return for a fee.
+ 
++@end enumerate
++
+ @iftex
+ @heading END OF TERMS AND CONDITIONS
+ @end iftex
+@@ -721,5 +723,3 @@
+ applications with the library.  If this is what you want to do, use
+ the GNU Lesser General Public License instead of this License.  But
+ first, please read @url{http://www.gnu.org/philosophy/why-not-lgpl.html}.
+-
+-@end enumerate