Make proper use of autoloads in sitefile, fixes bug #184175.

(Portage version: 2.1.3_rc6)

6 files changed, 21 insertions, 60 deletions

diff --git a/app-emacs/doxymacs/ChangeLog b/app-emacs/doxymacs/ChangeLog
index f1bb2d5baa07..128b914225f0 100644
--- a/app-emacs/doxymacs/ChangeLog
+++ b/app-emacs/doxymacs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emacs/doxymacs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/doxymacs/ChangeLog,v 1.2 2007/07/04 09:29:29 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/doxymacs/ChangeLog,v 1.3 2007/07/04 17:12:32 ulm Exp $
+
+*doxymacs-1.8.0-r2 (04 Jul 2007)
+
+  04 Jul 2007; Ulrich Mueller <ulm@gentoo.org> files/50doxymacs-gentoo.el,
+  -doxymacs-1.8.0.ebuild, -doxymacs-1.8.0-r1.ebuild,
+  +doxymacs-1.8.0-r2.ebuild:
+  Make proper use of autoloads in sitefile, fixes bug #184175.
 
 *doxymacs-1.8.0-r1 (04 Jul 2007)
 
diff --git a/app-emacs/doxymacs/doxymacs-1.8.0-r1.ebuild b/app-emacs/doxymacs/doxymacs-1.8.0-r2.ebuild
index 263b8eef5056..261b75e81f91 100644
--- a/app-emacs/doxymacs/doxymacs-1.8.0-r1.ebuild
+++ b/app-emacs/doxymacs/doxymacs-1.8.0-r2.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/doxymacs/doxymacs-1.8.0-r1.ebuild,v 1.1 2007/07/04 09:29:29 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/doxymacs/doxymacs-1.8.0-r2.ebuild,v 1.1 2007/07/04 17:12:32 ulm Exp $
 
 NEED_EMACS=22
 
@@ -18,7 +18,7 @@ IUSE=""
 DEPEND=">=dev-libs/libxml2-2.6.13"
 RDEPEND="${DEPEND}"
 
-SITEFILE="50doxymacs-gentoo.el"
+SITEFILE=50${PN}-gentoo.el
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
 src_compile() {
diff --git a/app-emacs/doxymacs/doxymacs-1.8.0.ebuild b/app-emacs/doxymacs/doxymacs-1.8.0.ebuild
deleted file mode 100644
index 18d3d3d9398e..000000000000
--- a/app-emacs/doxymacs/doxymacs-1.8.0.ebuild
+++ /dev/null
@@ -1,53 +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/doxymacs/doxymacs-1.8.0.ebuild,v 1.2 2007/07/04 09:29:29 opfer Exp $
-
-NEED_EMACS=22
-
-inherit elisp
-
-DESCRIPTION="Doxygen editing minor mode"
-HOMEPAGE="http://doxymacs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/libxml2-2.6.13"
-RDEPEND="${DEPEND}"
-
-SITEFILE="50doxymacs-gentoo.el"
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-src_compile() {
-	econf \
-		--with-datadir="${SITELISP}/${PN}" \
-		--with-lispdir="${SITELISP}/${PN}" \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-	elisp-make-autoload-file ${PN}-autoloads.el lisp/
-}
-
-src_install() {
-	emake \
-		prefix="${D}/usr" \
-		datadir="${D}/${SITELISP}/${PN}" \
-		lispdir="${D}/${SITELISP}/${PN}" \
-		install \
-		|| die "emake install failed"
-
-	elisp-install ${PN} ${PN}-autoloads.el
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-
-	dodoc ${DOCS} || die "dodoc failed"
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	elog "doxymacs is loaded for all C modes"
-	elog "if you need it in other situations, please add (require 'doxmacs)"
-	elog "to your ~/.emacs file"
-}
diff --git a/app-emacs/doxymacs/files/50doxymacs-gentoo.el b/app-emacs/doxymacs/files/50doxymacs-gentoo.el
index 5a179c63415f..2b0eaa949682 100644
--- a/app-emacs/doxymacs/files/50doxymacs-gentoo.el
+++ b/app-emacs/doxymacs/files/50doxymacs-gentoo.el
@@ -1,5 +1,15 @@
+
 ;;; doxymacs site-lisp configuration
 
 (add-to-list 'load-path "@SITELISP@")
+(autoload 'doxymacs-mode "doxymacs"
+  "Minor mode for using/creating Doxygen documentation." t)
+(autoload 'doxymacs-font-lock "doxymacs"
+  "Turn on font-lock for Doxygen keywords." t)
+(add-hook 'c-mode-common-hook 'doxymacs-mode)
 
-(add-hook 'c-mode-common-hook (load "doxymacs" nil t))
+;; optional font-lock support
+;;(defun gentoo-doxymacs-font-lock-hook ()
+;;  (if (or (eq major-mode 'c-mode) (eq major-mode 'c++-mode))
+;;      (doxymacs-font-lock)))
+;;(add-hook 'font-lock-mode-hook 'gentoo-doxymacs-font-lock-hook)
diff --git a/app-emacs/doxymacs/files/digest-doxymacs-1.8.0-r1 b/app-emacs/doxymacs/files/digest-doxymacs-1.8.0-r1
deleted file mode 100644
index 0bb51ca72d8f..000000000000
--- a/app-emacs/doxymacs/files/digest-doxymacs-1.8.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a2c1750efdec955f42e410a18ebd4eb8 doxymacs-1.8.0.tar.gz 133600
-RMD160 f7a0657251d9220d75aec08dd796dbba3cfe99a5 doxymacs-1.8.0.tar.gz 133600
-SHA256 a23fd833bc3c21ee5387c62597610941e987f9d4372916f996bf6249cc495afa doxymacs-1.8.0.tar.gz 133600
diff --git a/app-emacs/doxymacs/files/digest-doxymacs-1.8.0 b/app-emacs/doxymacs/files/digest-doxymacs-1.8.0-r2
index 0bb51ca72d8f..0bb51ca72d8f 100644
--- a/app-emacs/doxymacs/files/digest-doxymacs-1.8.0
+++ b/app-emacs/doxymacs/files/digest-doxymacs-1.8.0-r2