Version bump. Fix LICENSE.

(Portage version: 2.2_rc62/cvs/Linux i686)

4 files changed, 39 insertions, 8 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/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
+}