summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-emacs')
-rw-r--r--app-emacs/emacs-wiki/ChangeLog7
-rw-r--r--app-emacs/emacs-wiki/emacs-wiki-2.72-r1.ebuild16
-rw-r--r--app-emacs/emacs-wiki/files/50emacs-wiki-gentoo.el3
3 files changed, 11 insertions, 15 deletions
diff --git a/app-emacs/emacs-wiki/ChangeLog b/app-emacs/emacs-wiki/ChangeLog
index 1c03d0b686c5..50cf3b3bef81 100644
--- a/app-emacs/emacs-wiki/ChangeLog
+++ b/app-emacs/emacs-wiki/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-emacs/emacs-wiki
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-wiki/ChangeLog,v 1.21 2012/12/01 19:46:12 armin76 Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-wiki/ChangeLog,v 1.22 2014/06/07 11:14:30 ulm Exp $
+
+ 07 Jun 2014; Ulrich Müller <ulm@gentoo.org> emacs-wiki-2.72-r1.ebuild:
+ Remove redundant NEED_EMACS assignment. Specify LICENSE more precisely.
01 Dec 2012; Raúl Porcel <armin76@gentoo.org> emacs-wiki-2.72-r1.ebuild:
Drop sparc keywords
diff --git a/app-emacs/emacs-wiki/emacs-wiki-2.72-r1.ebuild b/app-emacs/emacs-wiki/emacs-wiki-2.72-r1.ebuild
index 8b4562aa0804..e0f89c2f10dc 100644
--- a/app-emacs/emacs-wiki/emacs-wiki-2.72-r1.ebuild
+++ b/app-emacs/emacs-wiki/emacs-wiki-2.72-r1.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-wiki/emacs-wiki-2.72-r1.ebuild,v 1.4 2012/12/01 19:46:12 armin76 Exp $
-
-NEED_EMACS=22
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-wiki/emacs-wiki-2.72-r1.ebuild,v 1.5 2014/06/07 11:14:30 ulm Exp $
inherit elisp
@@ -11,10 +9,9 @@ HOMEPAGE="http://www.mwolson.org/projects/EmacsWiki.html
http://www.emacswiki.org/cgi-bin/wiki.pl?EmacsWikiMode"
SRC_URI="http://www.mwolson.org/static/dist/emacs-wiki/${P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
DEPEND="app-emacs/htmlize
app-emacs/httpd"
@@ -31,14 +28,13 @@ src_unpack() {
}
src_compile() {
- elisp-compile *.el || die "elisp-compile failed"
+ elisp-compile *.el
makeinfo emacs-wiki.texi || die "makeinfo failed"
}
src_install() {
- elisp-install ${PN} *.{el,elc} || die "elisp-install failed"
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
- || die "elisp-site-file-install failed"
+ elisp-install ${PN} *.{el,elc}
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
doinfo *.info*
dodoc README ChangeLog*
docinto examples
diff --git a/app-emacs/emacs-wiki/files/50emacs-wiki-gentoo.el b/app-emacs/emacs-wiki/files/50emacs-wiki-gentoo.el
index d2522bfec9cb..487d5ddeecce 100644
--- a/app-emacs/emacs-wiki/files/50emacs-wiki-gentoo.el
+++ b/app-emacs/emacs-wiki/files/50emacs-wiki-gentoo.el
@@ -1,6 +1,3 @@
-
-;;; emacs-wiki site-lisp configuration
-
(add-to-list 'load-path "@SITELISP@")
(autoload 'emacs-wiki-mode "emacs-wiki"
"An Emacs mode for maintaining a local Wiki database." t)