Removed certain customizations from the site file.

4 files changed, 14 insertions, 24 deletions

diff --git a/app-emacs/haskell-mode/ChangeLog b/app-emacs/haskell-mode/ChangeLog
index 3d0e88ec4283..0a006d535513 100644
--- a/app-emacs/haskell-mode/ChangeLog
+++ b/app-emacs/haskell-mode/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emacs/haskell-mode
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/haskell-mode/ChangeLog,v 1.3 2003/06/29 19:00:22 aliz Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/haskell-mode/ChangeLog,v 1.4 2004/01/18 17:42:46 jbms Exp $
+
+  18 Jan 2004; Jeremy Maitin-Shepard <jbms@gentoo.org>
+  haskell-mode-1.44.ebuild, files/50haskell-mode-gentoo.el:
+  Removed certain customizations from the site file, resolving bug 38563.
+  Ebuild now reuses more of elisp.eclass.
 
 *haskell-mode-1.44 (09 Feb 2003)
 
diff --git a/app-emacs/haskell-mode/Manifest b/app-emacs/haskell-mode/Manifest
index b18ba9779dc0..4c7c2c2931b4 100644
--- a/app-emacs/haskell-mode/Manifest
+++ b/app-emacs/haskell-mode/Manifest
@@ -1,5 +1,5 @@
-MD5 8c7ed1decd9750f0eeba5c096d9e6586 ChangeLog 554
+MD5 fa343f59488d4bb308283d6a9be8756e ChangeLog 786
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
-MD5 0c78dded0c5da9b6f3e219844792d561 haskell-mode-1.44.ebuild 736
+MD5 9b65c0913fb9d0b836129333835ed699 haskell-mode-1.44.ebuild 732
 MD5 a310c35d01a33d349ce788cb408b70c3 files/digest-haskell-mode-1.44 68
 MD5 0dfd307298e9d2c80f00001a80d95f89 files/50haskell-mode-gentoo.el 476
diff --git a/app-emacs/haskell-mode/files/50haskell-mode-gentoo.el b/app-emacs/haskell-mode/files/50haskell-mode-gentoo.el
index 861eef194c81..d33108932076 100644
--- a/app-emacs/haskell-mode/files/50haskell-mode-gentoo.el
+++ b/app-emacs/haskell-mode/files/50haskell-mode-gentoo.el
@@ -11,9 +11,3 @@
   "Major mode for editing Haskell scripts." t)
 (autoload 'literate-haskell-mode "haskell-mode"
   "Major mode for editing literate Haskell scripts." t)
-(add-hook 'haskell-mode-hook 'turn-on-haskell-font-lock)
-(add-hook 'haskell-mode-hook 'turn-on-haskell-decl-scan)
-(add-hook 'haskell-mode-hook 'turn-on-haskell-doc-mode)
-(add-hook 'haskell-mode-hook 'turn-on-haskell-indent)
-(add-hook 'haskell-mode-hook 'turn-on-haskell-simple-indent)
-(add-hook 'haskell-mode-hook 'turn-on-haskell-hugs)
diff --git a/app-emacs/haskell-mode/haskell-mode-1.44.ebuild b/app-emacs/haskell-mode/haskell-mode-1.44.ebuild
index 5b08c67dad78..35082bbe4eaa 100644
--- a/app-emacs/haskell-mode/haskell-mode-1.44.ebuild
+++ b/app-emacs/haskell-mode/haskell-mode-1.44.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/haskell-mode/haskell-mode-1.44.ebuild,v 1.3 2003/09/06 22:01:25 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/haskell-mode/haskell-mode-1.44.ebuild,v 1.4 2004/01/18 17:42:46 jbms Exp $
 
 inherit elisp
 
@@ -17,23 +17,14 @@ DEPEND="virtual/emacs"
 RDEPEND="${DEPEND}"
 S="${WORKDIR}/${P}"
 
-SITEFILE=50haskell-mode-gentoo.el
-
-src_compile() {
-	 emacs --batch -f batch-byte-compile --no-site-file --no-init-file *.el
-}
+SITEFILE="50${PN}-gentoo.el"
 
 src_install() {
-	elisp-install ${PN} *.el *.elc
-	elisp-site-file-install ${FILESDIR}/${SITEFILE}
+	elisp_src_install
 	dohtml *.html *.hs
 }
 
 pkg_postinst() {
-	elisp-site-regen
+	elisp_pkg_postinst
 	einfo "See /usr/share/doc/${P}/html/installation-guide.html"
 }
-
-pkg_postrm() {
-	elisp-site-regen
-}