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

Package-Manager: portage-2.1.3_rc6

7 files changed, 39 insertions, 85 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/Manifest b/app-emacs/doxymacs/Manifest
index 5fb17fa6e852..997a7d04f5b2 100644
--- a/app-emacs/doxymacs/Manifest
+++ b/app-emacs/doxymacs/Manifest
@@ -1,37 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 50doxymacs-gentoo.el 132 RMD160 6987cf8af5dabe5c7ed2d18e2e2854fd2b6a1659 SHA1 d43beb194cb4d2bf76c5fc2e060348468de3cb4c SHA256 55e391adc590c91c6d50c9e4287945cdca42467a86edf8de1f738ef59b5f9c56
-MD5 701e01375df6f105bf4219b7cf5be5b8 files/50doxymacs-gentoo.el 132
-RMD160 6987cf8af5dabe5c7ed2d18e2e2854fd2b6a1659 files/50doxymacs-gentoo.el 132
-SHA256 55e391adc590c91c6d50c9e4287945cdca42467a86edf8de1f738ef59b5f9c56 files/50doxymacs-gentoo.el 132
+AUX 50doxymacs-gentoo.el 541 RMD160 2d7111b47e30c63d4fb9a4693ad78653c40931b2 SHA1 e86a1dfe48f00307c9aa35314e9e379139f4a955 SHA256 788b92aac1b0f3c2972a2d7043b99c7cd83416f949fb2ebe69fc5cd48191aa95
+MD5 f1e47ed641039ec363e88b2c45c27a58 files/50doxymacs-gentoo.el 541
+RMD160 2d7111b47e30c63d4fb9a4693ad78653c40931b2 files/50doxymacs-gentoo.el 541
+SHA256 788b92aac1b0f3c2972a2d7043b99c7cd83416f949fb2ebe69fc5cd48191aa95 files/50doxymacs-gentoo.el 541
 DIST doxymacs-1.8.0.tar.gz 133600 RMD160 f7a0657251d9220d75aec08dd796dbba3cfe99a5 SHA1 b2aafb4f2d20ceb63614c2b9f06d79dd484d8e2e SHA256 a23fd833bc3c21ee5387c62597610941e987f9d4372916f996bf6249cc495afa
-EBUILD doxymacs-1.8.0-r1.ebuild 995 RMD160 8a1b9da6d3ebf19bc4d64756fdb506735061bb18 SHA1 0e1f5bd8e631eca50f0d73cfa81bd1f3e7ca8770 SHA256 7bdfd49e0e44cdd732fe0dc073ae6ebf139b653282e082f4d0af867632a17143
-MD5 9cd577346f929a7d958f3f7435cb59af doxymacs-1.8.0-r1.ebuild 995
-RMD160 8a1b9da6d3ebf19bc4d64756fdb506735061bb18 doxymacs-1.8.0-r1.ebuild 995
-SHA256 7bdfd49e0e44cdd732fe0dc073ae6ebf139b653282e082f4d0af867632a17143 doxymacs-1.8.0-r1.ebuild 995
-EBUILD doxymacs-1.8.0.ebuild 1268 RMD160 b795011a6c92d4eb13bf5bd4b6ab96d18196997a SHA1 2d4ae140bc4d903033bbb874369df1ca822f55ef SHA256 040df0ff1b9ac28d39b3766e73297adb2331ba07eacc5f4a0c3b17acba6d1570
-MD5 c9768c21f6e1aae5bd5099a3bde9d48b doxymacs-1.8.0.ebuild 1268
-RMD160 b795011a6c92d4eb13bf5bd4b6ab96d18196997a doxymacs-1.8.0.ebuild 1268
-SHA256 040df0ff1b9ac28d39b3766e73297adb2331ba07eacc5f4a0c3b17acba6d1570 doxymacs-1.8.0.ebuild 1268
-MISC ChangeLog 880 RMD160 926a2dd6fc418fef34769dcd1606ed317cc5cd32 SHA1 8094cbca6b7393556aac1a800fa887b8c011ef4f SHA256 97cf30859212c32d3c64c26f1c9ff0980ed62eb1ad4f4792474b3d7a4d7e9575
-MD5 03d7ca56ab94030656e2d16ae20240dd ChangeLog 880
-RMD160 926a2dd6fc418fef34769dcd1606ed317cc5cd32 ChangeLog 880
-SHA256 97cf30859212c32d3c64c26f1c9ff0980ed62eb1ad4f4792474b3d7a4d7e9575 ChangeLog 880
+EBUILD doxymacs-1.8.0-r2.ebuild 988 RMD160 abe1a25612d32d988af9c7a0a1ba7da2bb972313 SHA1 540d7bf77c088a2353e2eac111115d2ebefa2733 SHA256 142b4fdf2eb31efa187a20ebcc437470df59cc0d02d7c755c51b076082d49fe7
+MD5 25ac8b550f4a57595e09f21a805b2208 doxymacs-1.8.0-r2.ebuild 988
+RMD160 abe1a25612d32d988af9c7a0a1ba7da2bb972313 doxymacs-1.8.0-r2.ebuild 988
+SHA256 142b4fdf2eb31efa187a20ebcc437470df59cc0d02d7c755c51b076082d49fe7 doxymacs-1.8.0-r2.ebuild 988
+MISC ChangeLog 1133 RMD160 2262c7fad888c7e50d42aaa74c37ced571597ba8 SHA1 a71ce914fe3cc5c520997eb699c3799e38946a40 SHA256 ff67af64a8bfde8aa17c857d0621d2b54356be31897e44d5f5a1c461476fe25c
+MD5 899bb4b87292b0e1b307f4ccdc2a6a12 ChangeLog 1133
+RMD160 2262c7fad888c7e50d42aaa74c37ced571597ba8 ChangeLog 1133
+SHA256 ff67af64a8bfde8aa17c857d0621d2b54356be31897e44d5f5a1c461476fe25c ChangeLog 1133
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata.xml 158
-MD5 1281572aced6584885a5de380cfa8e3d files/digest-doxymacs-1.8.0 244
-RMD160 f2d491e92ebe01d080c020ebd526677cb7bd91e4 files/digest-doxymacs-1.8.0 244
-SHA256 9ed9153a14169bf5e0ba0ab9a23bc007438295fadfa2eea1f1ba0bb0d35e2c1f files/digest-doxymacs-1.8.0 244
-MD5 1281572aced6584885a5de380cfa8e3d files/digest-doxymacs-1.8.0-r1 244
-RMD160 f2d491e92ebe01d080c020ebd526677cb7bd91e4 files/digest-doxymacs-1.8.0-r1 244
-SHA256 9ed9153a14169bf5e0ba0ab9a23bc007438295fadfa2eea1f1ba0bb0d35e2c1f files/digest-doxymacs-1.8.0-r1 244
+MD5 1281572aced6584885a5de380cfa8e3d files/digest-doxymacs-1.8.0-r2 244
+RMD160 f2d491e92ebe01d080c020ebd526677cb7bd91e4 files/digest-doxymacs-1.8.0-r2 244
+SHA256 9ed9153a14169bf5e0ba0ab9a23bc007438295fadfa2eea1f1ba0bb0d35e2c1f files/digest-doxymacs-1.8.0-r2 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGi2h/NQqtfCuFneMRAu9cAJ9lbggwx5ke+ao6Wsck+ijUOYhI9ACfc7Qd
-5v/MXbMEQJacyfMP6ZYJzJQ=
-=p16B
+iD8DBQFGi9UEOeoy/oIi7uwRAtHHAJ9NgUNajd2E7WO+spbuLcfDSjiPBQCgvZKH
+yw7qspYSocjJPCNdISd3zE0=
+=LEoV
 -----END PGP SIGNATURE-----
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