Version bump. Fix LICENSE.

Package-Manager: portage-2.2_rc62/cvs/Linux i686

5 files changed, 48 insertions, 15 deletions

diff --git a/app-emacs/muse/ChangeLog b/app-emacs/muse/ChangeLog
index b9e18f008419..47d5e4006a45 100644
--- a/app-emacs/muse/ChangeLog
+++ b/app-emacs/muse/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emacs/muse
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/muse/ChangeLog,v 1.22 2009/03/20 22:16:34 tcunha Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/muse/ChangeLog,v 1.23 2010/02/02 08:58:03 ulm Exp $
+
+*muse-3.20 (02 Feb 2010)
+
+  02 Feb 2010; Ulrich Mueller <ulm@gentoo.org> +muse-3.20.ebuild:
+  Version bump. Fix LICENSE.
 
   20 Mar 2009; Tiago Cunha <tcunha@gentoo.org> muse-3.12.ebuild:
   stable sparc
diff --git a/app-emacs/muse/Manifest b/app-emacs/muse/Manifest
index 79988904d15f..7c3a8bd4e8e7 100644
--- a/app-emacs/muse/Manifest
+++ b/app-emacs/muse/Manifest
@@ -1,15 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 50muse-gentoo.el 99 RMD160 c1d2ef90d4cd6098e1efbb961c0a4fdacdcf0907 SHA1 5dd728f282e03e1159270a197e7b4460fd87c465 SHA256 b2efed8520af2ddb3bd2757da17c6daa2757950c228deb387db352da62dae590
+AUX 50muse-gentoo.el 64 RMD160 bc941125629321c26986d741f05592bbc7105c4a SHA1 958b280a1e0d4152db16e6bcaded6a7ed590515f SHA256 248c2ae2ba32c6da815274fba488c2ff4ba5cebdde0116d50e0a250e8a9de28f
 DIST muse-3.12.tar.gz 396204 RMD160 f71f2af2bd34cf516df16c81e5d554e9a49648fd SHA1 0c29488b2294013527d13904d7a8950d2b10a19b SHA256 d10e48d3c236945e970bc80333c83f67735135891a5dfe04b68d98ab7b909b54
-EBUILD muse-3.12.ebuild 872 RMD160 405db99d1437d0c6ddbc637bf75413243c109992 SHA1 d1fbf1d3dd0ce7215822a320e3aad32b77bb7e8d SHA256 19bc3404ffa68c7a6600ce8f06c2eb1a08689cf348cc39512d58b5a4bf0f4603
-MISC ChangeLog 2994 RMD160 2a93fe6ec6bedd4baeae2fbd78d95accf5f81a3f SHA1 7fdb937a893b4a1ca80e8c56fe8a8c7cad8474c5 SHA256 c2ad1bf74ba520d1fb0c4686f0ebfc7a81d4a68549cd7c22f70382e2ea8b0ff9
+DIST muse-3.20.tar.gz 411316 RMD160 08ddeb181d5ef64863ecd90545cc028bc20d2d5b SHA1 08acfbe3c382ba261c11d9c4565cc5f19a490115 SHA256 080990e105050fc963bb1938209cc843f259488ae5c8373c5487f99a8dc383b6
+EBUILD muse-3.12.ebuild 887 RMD160 6b00e4cb859c04ecc833ffbe19ccbc9002dd5959 SHA1 cb5ee006c2f23a67118b11d53306ad819d4bd2e4 SHA256 76b3380fb0d12e926978e9a01f5da65e38da13b729cf8a4c10ced7edb4dafbd1
+EBUILD muse-3.20.ebuild 920 RMD160 88dec40c60c75c00f69a1331f1c07cebc456d792 SHA1 0ac2cb78746fe7480c3f411eacac1ca6dfdc4dc8 SHA256 3d0f11077a2ec7f4435dc0cb52f040f5e50ab17296d74fe0c514bdd5fe2c29e4
+MISC ChangeLog 3113 RMD160 7a1da0f5bc6de7e3c59ab8d8a19ab95006271af3 SHA1 a1e1032ad04f11107cdfe9b6ada19490c5602e41 SHA256 b2cc775cb02e21981bdb70c6274807f15e7578270218e7b7ab41fdc2236111f9
 MISC metadata.xml 1548 RMD160 4d68cbd2159f887b9671ac15b632e49e5cd188de SHA1 627d903d2693bb004ff1d7746b3e3c89ac841d7a SHA256 0cc2573e15403b9ff129596986b2d3f97102f787436b2e6b2c9006bbf49664da
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAknEFPAACgkQ/Kkm35zQzl5QjACgy1X7bAWN7d6ny4makOAs6R0T
-ohIAn2mfrUx0n4E8YdTKr7w2PHLS3KpG
-=foPV
+iEYEARECAAYFAktn6TMACgkQOeoy/oIi7uwOwwCgkdbRrcgqHHcEYoUCQYFb8o73
+qO0AoOeDCPF+2NMXzoVIZ4FBI4ZPeSTQ
+=XLXF
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/muse/files/50muse-gentoo.el b/app-emacs/muse/files/50muse-gentoo.el
index 2cc2cee674a7..63bea6e9b3ed 100644
--- a/app-emacs/muse/files/50muse-gentoo.el
+++ b/app-emacs/muse/files/50muse-gentoo.el
@@ -1,5 +1,2 @@
-
-;;; muse site-lisp configuration
-
 (add-to-list 'load-path "@SITELISP@")
 (require 'muse-autoloads)
diff --git a/app-emacs/muse/muse-3.12.ebuild b/app-emacs/muse/muse-3.12.ebuild
index b423e6b3284d..2bf23c82ac32 100644
--- a/app-emacs/muse/muse-3.12.ebuild
+++ b/app-emacs/muse/muse-3.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/muse/muse-3.12.ebuild,v 1.4 2009/03/20 22:16:34 tcunha Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/muse/muse-3.12.ebuild,v 1.5 2010/02/02 08:58:03 ulm Exp $
 
 inherit elisp
 
@@ -8,7 +8,7 @@ DESCRIPTION="Muse-mode is similar to EmacsWikiMode, but more focused on publishi
 HOMEPAGE="http://www.mwolson.org/projects/MuseMode.html"
 SRC_URI="http://download.gna.org/muse-el/${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3 FDL-1.2 GPL-2 MIT"
 SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86 ~x86-fbsd"
 IUSE=""
diff --git a/app-emacs/muse/muse-3.20.ebuild b/app-emacs/muse/muse-3.20.ebuild
new file mode 100644
index 000000000000..4e6aced1cd76
--- /dev/null
+++ b/app-emacs/muse/muse-3.20.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/muse/muse-3.20.ebuild,v 1.1 2010/02/02 08:58:03 ulm Exp $
+
+inherit elisp
+
+DESCRIPTION="Muse-mode is similar to EmacsWikiMode, but more focused on publishing to various formats"
+HOMEPAGE="http://www.mwolson.org/projects/MuseMode.html"
+SRC_URI="http://download.gna.org/muse-el/${P}.tar.gz"
+
+LICENSE="GPL-3 FDL-1.2 GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	elisp-install ${PN} lisp/*.el lisp/*.elc || die
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	doinfo texi/muse.info || die
+	dodoc AUTHORS NEWS README ChangeLog* || die "dodoc failed"
+	insinto /usr/share/doc/${PF}
+	doins -r contrib etc examples experimental scripts || die
+}