Use autoload mechanism in site-init file.

Package-Manager: portage-2.1.3.13

5 files changed, 39 insertions, 27 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/Manifest b/app-emacs/emacs-wiki/Manifest
index f38bdbc1201d..54d5ba21c75e 100644
--- a/app-emacs/emacs-wiki/Manifest
+++ b/app-emacs/emacs-wiki/Manifest
@@ -1,30 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 50emacs-wiki-gentoo.el 101 RMD160 3f9aabb427a1a75f3bad3203ab1a3922118eb4c8 SHA1 b2e5fcc4560e5097dac249d5bd55eac5be5dc835 SHA256 c8e5f6d2c5250d219f39579f49ab89ead74844fb602d79c053fabef7713a46bc
-MD5 18fd7b9a561771ca4b63e5342734bdc1 files/50emacs-wiki-gentoo.el 101
-RMD160 3f9aabb427a1a75f3bad3203ab1a3922118eb4c8 files/50emacs-wiki-gentoo.el 101
-SHA256 c8e5f6d2c5250d219f39579f49ab89ead74844fb602d79c053fabef7713a46bc files/50emacs-wiki-gentoo.el 101
+AUX 50emacs-wiki-gentoo.el 270 RMD160 8a5b993cf2d08cbe6bc6789668ac26b974aab294 SHA1 71be5ac49151047552c23073b5a0a62dd485079b SHA256 d865f84a30d43a980524b7c598ba9a9467afbae0499cdcbb659e2a29643b67e2
+MD5 93e4ff7a0fdbf86c0b1bdf2d9a5ec3b7 files/50emacs-wiki-gentoo.el 270
+RMD160 8a5b993cf2d08cbe6bc6789668ac26b974aab294 files/50emacs-wiki-gentoo.el 270
+SHA256 d865f84a30d43a980524b7c598ba9a9467afbae0499cdcbb659e2a29643b67e2 files/50emacs-wiki-gentoo.el 270
 DIST emacs-wiki-2.72.tar.gz 217896 RMD160 e33ecc358a7f2dcc51cbd1d923b20b0b0692d693 SHA1 c02f312bbd237d1976ebc8b98efe1caee257a532 SHA256 66d39fbae5020d2936fbfae754f34415fff3ed8fb5f3f4b97c8bdfddbb81b5c5
-EBUILD emacs-wiki-2.72.ebuild 1198 RMD160 972fdf354ae61412c3bec68a4ec1a5e742702d8b SHA1 d5b93ed6ee0edcd1a6ff45ea993adc7bd8b3c043 SHA256 b9c99661d5ad0fafb0eafc5d6508f3b119400ea2f6fac49a245e4a6df8361c45
-MD5 ca704f0bf53bb9505b33a2a549ac9ed8 emacs-wiki-2.72.ebuild 1198
-RMD160 972fdf354ae61412c3bec68a4ec1a5e742702d8b emacs-wiki-2.72.ebuild 1198
-SHA256 b9c99661d5ad0fafb0eafc5d6508f3b119400ea2f6fac49a245e4a6df8361c45 emacs-wiki-2.72.ebuild 1198
-MISC ChangeLog 2093 RMD160 8004a84456afc7254f3c4e74d0691f0cb1455326 SHA1 4ea0c0d163419aff6f8f7ceeaa0109fa719832f8 SHA256 0e8b2361892585f156d53c2c79f2a438cbd5e5eff8cc03072dbcb486587734e1
-MD5 5495ed19e9e0a78dce8bd9b80518044f ChangeLog 2093
-RMD160 8004a84456afc7254f3c4e74d0691f0cb1455326 ChangeLog 2093
-SHA256 0e8b2361892585f156d53c2c79f2a438cbd5e5eff8cc03072dbcb486587734e1 ChangeLog 2093
+EBUILD emacs-wiki-2.72-r1.ebuild 1279 RMD160 4b155c20a2e9a51e7c3a5ed8d592ef37bbf73c18 SHA1 80f628b1b459f71b59966176690ff71f29a78789 SHA256 ab707508d2eb4ec9f1ffb60bbd1a074f9a4d15c4593076163184dc49ad4f2504
+MD5 9b6fc4a94949dfbc76f09a7ff8b9db43 emacs-wiki-2.72-r1.ebuild 1279
+RMD160 4b155c20a2e9a51e7c3a5ed8d592ef37bbf73c18 emacs-wiki-2.72-r1.ebuild 1279
+SHA256 ab707508d2eb4ec9f1ffb60bbd1a074f9a4d15c4593076163184dc49ad4f2504 emacs-wiki-2.72-r1.ebuild 1279
+MISC ChangeLog 2303 RMD160 b9ebf51feae8bb9c8b50712f47d14a9f89fdb5ff SHA1 493c018c2e77707e9267d1a0cb61b9329dcbec30 SHA256 61a873f79b6f5219073fd3abe805627d720a87f1e580c9357c0f6eb7d3074b9d
+MD5 41b1a59d8f0e607ab7f20ee7db114a07 ChangeLog 2303
+RMD160 b9ebf51feae8bb9c8b50712f47d14a9f89fdb5ff ChangeLog 2303
+SHA256 61a873f79b6f5219073fd3abe805627d720a87f1e580c9357c0f6eb7d3074b9d ChangeLog 2303
 MISC metadata.xml 808 RMD160 75b6c176e497fcdb656e2a922de6b12eb9394d79 SHA1 38886b73c5abffff7958548b4f5ac6aab9189bea SHA256 f797ba53dae94348b968ef038902cb8c6d7aa42a7db9ba3958fe2d7833fc06d2
 MD5 ad233270cb8f454e2923316f8c7e229d metadata.xml 808
 RMD160 75b6c176e497fcdb656e2a922de6b12eb9394d79 metadata.xml 808
 SHA256 f797ba53dae94348b968ef038902cb8c6d7aa42a7db9ba3958fe2d7833fc06d2 metadata.xml 808
-MD5 35d19fa0948a315aa08a1113ab14f0ff files/digest-emacs-wiki-2.72 247
-RMD160 9d6fd93cd2811e586c54a8a6ed7c4bd2d5ccbf06 files/digest-emacs-wiki-2.72 247
-SHA256 eef437e1f99f7cd99b1dff733dcccc88f2b4f367e0b3e52ea7b7ae82b0564df8 files/digest-emacs-wiki-2.72 247
+MD5 35d19fa0948a315aa08a1113ab14f0ff files/digest-emacs-wiki-2.72-r1 247
+RMD160 9d6fd93cd2811e586c54a8a6ed7c4bd2d5ccbf06 files/digest-emacs-wiki-2.72-r1 247
+SHA256 eef437e1f99f7cd99b1dff733dcccc88f2b4f367e0b3e52ea7b7ae82b0564df8 files/digest-emacs-wiki-2.72-r1 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGjCPlNQqtfCuFneMRAl8qAKCDTOReah1EsXNg3ATwXAByEO+5PwCfRRt7
-g6PmmCSXe+z/oEmmoHr8LAk=
-=WnK7
+iD8DBQFHFQpsOeoy/oIi7uwRApHwAJwPdGg4fSSbbJQOtAHAMNC0h0dTHgCcCvfa
+UPYSWN+G6iYpBqeBpFi18ow=
+=mPOx
 -----END PGP SIGNATURE-----
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