Use autoload mechanism in site-init file.

(Portage version: 2.1.3.13)

4 files changed, 21 insertions, 9 deletions

diff --git a/app-emacs/emacs-wiki/ChangeLog b/app-emacs/emacs-wiki/ChangeLog
index c81909c0ad71..fbe9d228772a 100644
--- a/app-emacs/emacs-wiki/ChangeLog
+++ b/app-emacs/emacs-wiki/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/emacs-wiki
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-wiki/ChangeLog,v 1.17 2007/07/04 22:49:03 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-wiki/ChangeLog,v 1.18 2007/10/16 19:00:41 ulm Exp $
+
+*emacs-wiki-2.72-r1 (16 Oct 2007)
+
+  16 Oct 2007; Ulrich Mueller <ulm@gentoo.org> files/50emacs-wiki-gentoo.el,
+  -emacs-wiki-2.72.ebuild, +emacs-wiki-2.72-r1.ebuild:
+  Use autoload mechanism in site-init file.
 
   04 Jul 2007; Christian Faulhammer <opfer@gentoo.org>
   emacs-wiki-2.72.ebuild:
diff --git a/app-emacs/emacs-wiki/emacs-wiki-2.72.ebuild b/app-emacs/emacs-wiki/emacs-wiki-2.72-r1.ebuild
index c26142fff60b..3aedd011a259 100644
--- a/app-emacs/emacs-wiki/emacs-wiki-2.72.ebuild
+++ b/app-emacs/emacs-wiki/emacs-wiki-2.72-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.ebuild,v 1.3 2007/07/04 22:49:03 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-wiki/emacs-wiki-2.72-r1.ebuild,v 1.1 2007/10/16 19:00:41 ulm Exp $
 
 inherit elisp
 
@@ -8,6 +8,7 @@ DESCRIPTION="Maintain a local Wiki using Emacs-friendly markup"
 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"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
@@ -17,10 +18,11 @@ RESTRICT="test"
 
 DEPEND="app-emacs/htmlize
 	app-emacs/table
-	app-emacs/httpd
-	sys-apps/texinfo"
+	app-emacs/httpd"
+
+RDEPEND="${DEPEND}"
 
-SITEFILE=50emacs-wiki-gentoo.el
+SITEFILE=50${PN}-gentoo.el
 
 src_unpack() {
 	unpack ${A}
@@ -35,10 +37,11 @@ src_compile() {
 }
 
 src_install() {
-	elisp-install ${PN} *.{el,elc}
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	elisp-install ${PN} *.{el,elc} || die "elisp-install failed"
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+		|| die "elisp-site-file-install failed"
 	doinfo *.info*
-	dodoc ChangeLog*
+	dodoc README ChangeLog*
 	docinto examples
 	dodoc examples/default.css
 }
diff --git a/app-emacs/emacs-wiki/files/50emacs-wiki-gentoo.el b/app-emacs/emacs-wiki/files/50emacs-wiki-gentoo.el
index e9041c774a41..d2522bfec9cb 100644
--- a/app-emacs/emacs-wiki/files/50emacs-wiki-gentoo.el
+++ b/app-emacs/emacs-wiki/files/50emacs-wiki-gentoo.el
@@ -2,4 +2,7 @@
 ;;; emacs-wiki site-lisp configuration
 
 (add-to-list 'load-path "@SITELISP@")
-(require 'emacs-wiki)
+(autoload 'emacs-wiki-mode "emacs-wiki"
+  "An Emacs mode for maintaining a local Wiki database." t)
+(autoload 'emacs-wiki-find-file "emacs-wiki"
+  "Open the Emacs Wiki page WIKI by name." t)
diff --git a/app-emacs/emacs-wiki/files/digest-emacs-wiki-2.72 b/app-emacs/emacs-wiki/files/digest-emacs-wiki-2.72-r1
index 7de6a34415ce..7de6a34415ce 100644
--- a/app-emacs/emacs-wiki/files/digest-emacs-wiki-2.72
+++ b/app-emacs/emacs-wiki/files/digest-emacs-wiki-2.72-r1