Use autoload instead of require in site-init file. Remove old versions.

(Portage version: 2.1.3.14)

7 files changed, 29 insertions, 47 deletions

diff --git a/app-emacs/howm/ChangeLog b/app-emacs/howm/ChangeLog
index 723d0aeb4749..0761c8fe7dda 100644
--- a/app-emacs/howm/ChangeLog
+++ b/app-emacs/howm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/howm
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/howm/ChangeLog,v 1.16 2007/07/06 18:37:09 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/howm/ChangeLog,v 1.17 2007/10/17 20:02:21 ulm Exp $
+
+*howm-1.3.4-r1 (17 Oct 2007)
+
+  17 Oct 2007; Ulrich Mueller <ulm@gentoo.org> +files/50howm-gentoo.el,
+  -howm-1.2-r1.ebuild, -howm-1.3.3.ebuild, +howm-1.3.4-r1.ebuild:
+  Use autoload instead of require in site-init file. Remove old versions.
 
 *howm-1.3.4 (06 Jul 2007)
 
diff --git a/app-emacs/howm/files/50howm-gentoo.el b/app-emacs/howm/files/50howm-gentoo.el
new file mode 100644
index 000000000000..c159e392c7a4
--- /dev/null
+++ b/app-emacs/howm/files/50howm-gentoo.el
@@ -0,0 +1,5 @@
+
+;;; howm site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'howm-menu "howm" nil t)
diff --git a/app-emacs/howm/files/digest-howm-1.2-r1 b/app-emacs/howm/files/digest-howm-1.2-r1
deleted file mode 100644
index 5ab3c287cd47..000000000000
--- a/app-emacs/howm/files/digest-howm-1.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 433f591f2d51657f603d0543d30acc2e howm-1.2.tar.gz 273437
-RMD160 af841be493c300257cb7deb2dbe43e67f2fb9616 howm-1.2.tar.gz 273437
-SHA256 5863f47ec1c0ad306fbc11e872be93009044a2c95938acde73c0ee6ce76404ff howm-1.2.tar.gz 273437
diff --git a/app-emacs/howm/files/digest-howm-1.3.3 b/app-emacs/howm/files/digest-howm-1.3.3
deleted file mode 100644
index cac1fb4fd70f..000000000000
--- a/app-emacs/howm/files/digest-howm-1.3.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e168b0460517e7f514db0ee9b51fc722 howm-1.3.3.tar.gz 403412
-RMD160 5fb760612cedf802d40ffccc6b217c63fb347c3d howm-1.3.3.tar.gz 403412
-SHA256 c9eb21c3367a68ba4ac5fd7a9d9f08c97fe4b465e708e20f0d3dcab66b5e47e1 howm-1.3.3.tar.gz 403412
diff --git a/app-emacs/howm/files/digest-howm-1.3.4-r1 b/app-emacs/howm/files/digest-howm-1.3.4-r1
new file mode 100644
index 000000000000..b52fa80652ac
--- /dev/null
+++ b/app-emacs/howm/files/digest-howm-1.3.4-r1
@@ -0,0 +1,3 @@
+MD5 8b14177730510108016f2f37f8209e9e howm-1.3.4.tar.gz 405217
+RMD160 2354ea1f2d5516457caa19d612bbb76de4344a48 howm-1.3.4.tar.gz 405217
+SHA256 7289f57bd60dfcd90647960263632b35cb4bc668efcffa5ac54519b6b7fba856 howm-1.3.4.tar.gz 405217
diff --git a/app-emacs/howm/howm-1.2-r1.ebuild b/app-emacs/howm/howm-1.2-r1.ebuild
deleted file mode 100644
index d961b4da82fc..000000000000
--- a/app-emacs/howm/howm-1.2-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/howm/howm-1.2-r1.ebuild,v 1.4 2007/07/06 18:37:09 ulm Exp $
-
-inherit elisp
-
-DESCRIPTION="note-taking tool on Emacs"
-HOMEPAGE="http://howm.sourceforge.jp/"
-SRC_URI="http://howm.sourceforge.jp/a/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-SITEFILE="55howm-gentoo.el"
-
-src_compile() {
-	cp ${FILESDIR}/${SITEFILE} ${T}
-	if use linguas_ja ; then
-		cat >>${T}/${SITEFILE}<<-EOF
-		(setq howm-menu-lang 'ja)	; Japanese interface"
-		EOF
-	fi
-
-	econf --with-docdir=/usr/share/doc/${P} || die
-	emake < /dev/null || die
-}
-
-src_install() {
-	emake < /dev/null \
-		DESTDIR=${D} PREFIX=/usr LISPDIR=${SITELISP}/${PN} install || die
-	elisp-site-file-install ${T}/${SITEFILE} || die
-}
diff --git a/app-emacs/howm/howm-1.3.3.ebuild b/app-emacs/howm/howm-1.3.4-r1.ebuild
index aae04f2cf5a1..b8d4214018ac 100644
--- a/app-emacs/howm/howm-1.3.3.ebuild
+++ b/app-emacs/howm/howm-1.3.4-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/howm/howm-1.3.3.ebuild,v 1.5 2007/07/06 18:37:09 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/howm/howm-1.3.4-r1.ebuild,v 1.1 2007/10/17 20:02:21 ulm Exp $
 
 inherit elisp
 
-DESCRIPTION="note-taking tool on Emacs"
+DESCRIPTION="Note-taking tool on Emacs"
 HOMEPAGE="http://howm.sourceforge.jp/"
 SRC_URI="http://howm.sourceforge.jp/a/${P}.tar.gz"
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="linguas_ja"
 
-SITEFILE="55howm-gentoo.el"
+SITEFILE=50${PN}-gentoo.el
 
 src_compile() {
 	if use linguas_ja ; then
@@ -22,7 +22,7 @@ src_compile() {
 		EOF
 	fi
 
-	econf --with-docdir=/usr/share/doc/${P} || die "econf failed"
+	econf --with-docdir=/usr/share/doc/${PF} || die "econf failed"
 	emake < /dev/null || die "emake failed"
 }
 
@@ -30,6 +30,14 @@ src_install() {
 	emake < /dev/null \
 		DESTDIR="${D}" PREFIX=/usr LISPDIR="${SITELISP}/${PN}" install \
 		|| die "emake install failed"
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc NEWS README AUTHORS ChangeLog || die "dodoc failed"
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+		|| die "elisp-site-file-install failed"
+	dodoc ChangeLog || die "dodoc failed"
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	elog "site-gentoo.el does no longer define global keybindings for howm."
+	elog "Add the following line to ~/.emacs for the previous behaviour:"
+	elog "  (require 'howm)"
 }