corrected initialisation for newer haskell mode, thanks to Ivan <the_greatguru@hotmail.com>, who reported that in bug 163211

Package-Manager: portage-2.1.1-r2

4 files changed, 43 insertions, 23 deletions

diff --git a/app-emacs/haskell-mode/ChangeLog b/app-emacs/haskell-mode/ChangeLog
index ec19b17d20ca..478364dc3c64 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/haskell-mode/ChangeLog,v 1.15 2006/04/27 10:28:51 antarus Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/haskell-mode/ChangeLog,v 1.16 2007/01/22 10:41:58 opfer Exp $
+
+  22 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
+  +files/51haskell-mode-gentoo.el, haskell-mode-2.1.ebuild:
+  corrected initialisation for newer haskell mode, thanks to Ivan
+  <the_greatguru@hotmail.com>, who reported that in bug 163211
 
   27 Apr 2006; Alec Warner <antarus@gentoo.org>
   files/digest-haskell-mode-1.44-r1, files/digest-haskell-mode-1.45,
diff --git a/app-emacs/haskell-mode/Manifest b/app-emacs/haskell-mode/Manifest
index a89927e9d745..3e5bde02e6cb 100644
--- a/app-emacs/haskell-mode/Manifest
+++ b/app-emacs/haskell-mode/Manifest
@@ -1,32 +1,39 @@
-AUX 50haskell-mode-gentoo.el 474 RMD160 fb66c78ee9f41b25749b866168d9f7a960c2339c SHA1 ae3714c26db6c860a2d498fba7eef810380f124a SHA256 fc1a87542afde605bff0b52217d1ca031b3adb1cf938824090587495674c6288 size 474
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 50haskell-mode-gentoo.el 474 RMD160 fb66c78ee9f41b25749b866168d9f7a960c2339c SHA1 ae3714c26db6c860a2d498fba7eef810380f124a SHA256 fc1a87542afde605bff0b52217d1ca031b3adb1cf938824090587495674c6288
 MD5 91d511588d15fb8c96e0b69626998588 files/50haskell-mode-gentoo.el 474
 RMD160 fb66c78ee9f41b25749b866168d9f7a960c2339c files/50haskell-mode-gentoo.el 474
 SHA256 fc1a87542afde605bff0b52217d1ca031b3adb1cf938824090587495674c6288 files/50haskell-mode-gentoo.el 474
-DIST haskell-mode-1.44.tar.gz 58601 RMD160 e6ba24edd96bbc219f53bbfaefd17bd342a2ced6 SHA256 7950445082f7b5cc2e25477367e6dde1746a4799edfa54a45591029730a34712 size 58601
-DIST haskell-mode-1.45.tar.gz 60525 RMD160 454e92a3ca9f70b33e26e4ef11dce0bd204a228a SHA256 c56660ae97ac104d4d64593a97618873f19bc2d8faad5052b08ec007ab8213db size 60525
-DIST haskell-mode-2.0.tar.gz 66814 RMD160 935b805e837ac9cc3a85bfad1f70168ab506f76d SHA256 c9d1236fe8d9704537fc1a24921f6bf09150c6d53192ef831645865359c6a078 size 66814
-DIST haskell-mode-2.1.tar.gz 73855 RMD160 d5c30db6c37fcea35a544930f2cac6e8c6dd5c5e SHA256 51c7529b217aafdf3cef843e0fc25b3735bebb259effd9c8bc6e8f72a4b65046 size 73855
-EBUILD haskell-mode-1.44-r1.ebuild 698 RMD160 99149db9e0e5b55a6c0c9e54c86010597985b202 SHA1 571ea4c43eabc293494721a79f186d602585e55d SHA256 5641af3f66f827d4561bccb4ddbbbeb4aef38b4e622df2fcae5bede63f0b7874 size 698
+AUX 51haskell-mode-gentoo.el 67 RMD160 9ea2f682c57d3e3a18f8081a0c044ff4fa11a5f3 SHA1 d7e6cec43642fab4fbd4ebfc6f3379ed721e6783 SHA256 16c1296513bc465e783e8f97c16fe99faaed0ce98ca3f13e449e7c5895e7f5ef
+MD5 0d0c7cee189837c0165346c87ae9b249 files/51haskell-mode-gentoo.el 67
+RMD160 9ea2f682c57d3e3a18f8081a0c044ff4fa11a5f3 files/51haskell-mode-gentoo.el 67
+SHA256 16c1296513bc465e783e8f97c16fe99faaed0ce98ca3f13e449e7c5895e7f5ef files/51haskell-mode-gentoo.el 67
+DIST haskell-mode-1.44.tar.gz 58601 RMD160 e6ba24edd96bbc219f53bbfaefd17bd342a2ced6 SHA256 7950445082f7b5cc2e25477367e6dde1746a4799edfa54a45591029730a34712
+DIST haskell-mode-1.45.tar.gz 60525 RMD160 454e92a3ca9f70b33e26e4ef11dce0bd204a228a SHA256 c56660ae97ac104d4d64593a97618873f19bc2d8faad5052b08ec007ab8213db
+DIST haskell-mode-2.0.tar.gz 66814 RMD160 935b805e837ac9cc3a85bfad1f70168ab506f76d SHA256 c9d1236fe8d9704537fc1a24921f6bf09150c6d53192ef831645865359c6a078
+DIST haskell-mode-2.1.tar.gz 73855 RMD160 d5c30db6c37fcea35a544930f2cac6e8c6dd5c5e SHA256 51c7529b217aafdf3cef843e0fc25b3735bebb259effd9c8bc6e8f72a4b65046
+EBUILD haskell-mode-1.44-r1.ebuild 698 RMD160 99149db9e0e5b55a6c0c9e54c86010597985b202 SHA1 571ea4c43eabc293494721a79f186d602585e55d SHA256 5641af3f66f827d4561bccb4ddbbbeb4aef38b4e622df2fcae5bede63f0b7874
 MD5 7a5121a398fafc4a703a009bd0600ee5 haskell-mode-1.44-r1.ebuild 698
 RMD160 99149db9e0e5b55a6c0c9e54c86010597985b202 haskell-mode-1.44-r1.ebuild 698
 SHA256 5641af3f66f827d4561bccb4ddbbbeb4aef38b4e622df2fcae5bede63f0b7874 haskell-mode-1.44-r1.ebuild 698
-EBUILD haskell-mode-1.45.ebuild 716 RMD160 39312d09ffdee2691bc2b0220f40e34a7e04d8c8 SHA1 83c935083b812caafe2b2fdb91ed025ccfa3fea4 SHA256 0164e3849168ef8fcfca0415493b3dbb399d3a7fa4efa54f447c1f531cd874d8 size 716
+EBUILD haskell-mode-1.45.ebuild 716 RMD160 39312d09ffdee2691bc2b0220f40e34a7e04d8c8 SHA1 83c935083b812caafe2b2fdb91ed025ccfa3fea4 SHA256 0164e3849168ef8fcfca0415493b3dbb399d3a7fa4efa54f447c1f531cd874d8
 MD5 493956070152e69311adba81c897c305 haskell-mode-1.45.ebuild 716
 RMD160 39312d09ffdee2691bc2b0220f40e34a7e04d8c8 haskell-mode-1.45.ebuild 716
 SHA256 0164e3849168ef8fcfca0415493b3dbb399d3a7fa4efa54f447c1f531cd874d8 haskell-mode-1.45.ebuild 716
-EBUILD haskell-mode-2.0.ebuild 1073 RMD160 ba7fd6efee38b4d03977b32a2a8009c374455e8c SHA1 ad86ae760df24024deaf5404513752b2b4edb8f9 SHA256 dc2353a9c8c2933c0c12ad55ed6cb9e0d06cc305f9f8babe4fb1afc61260a7dc size 1073
+EBUILD haskell-mode-2.0.ebuild 1073 RMD160 ba7fd6efee38b4d03977b32a2a8009c374455e8c SHA1 ad86ae760df24024deaf5404513752b2b4edb8f9 SHA256 dc2353a9c8c2933c0c12ad55ed6cb9e0d06cc305f9f8babe4fb1afc61260a7dc
 MD5 ce59fa1474407136123ba41cfb35c81d haskell-mode-2.0.ebuild 1073
 RMD160 ba7fd6efee38b4d03977b32a2a8009c374455e8c haskell-mode-2.0.ebuild 1073
 SHA256 dc2353a9c8c2933c0c12ad55ed6cb9e0d06cc305f9f8babe4fb1afc61260a7dc haskell-mode-2.0.ebuild 1073
-EBUILD haskell-mode-2.1.ebuild 1073 RMD160 975eae65b13e4853511e14333bdc750e12e4f390 SHA1 d7b32ca17722d2bfa1cc6f5fadd65070ecbf4ef9 SHA256 75cb7b79e4c17ddf673f5bb3ee1ccc669fc9a0c4eb9a0a8713ceb6dda195a7ea size 1073
-MD5 b6fe5134bd9c718d3abc869386e22b45 haskell-mode-2.1.ebuild 1073
-RMD160 975eae65b13e4853511e14333bdc750e12e4f390 haskell-mode-2.1.ebuild 1073
-SHA256 75cb7b79e4c17ddf673f5bb3ee1ccc669fc9a0c4eb9a0a8713ceb6dda195a7ea haskell-mode-2.1.ebuild 1073
-MISC ChangeLog 2154 RMD160 cdd881b383db55c6c9a7e38643986fbc4250fe76 SHA1 9f58cef0b9844e62feab66e5adc8685eb79114fb SHA256 0f215ae8a1ff03db46fd42bac48ebd46bd46c8a2b347437a4b755566dc762fce size 2154
-MD5 045ed40e68e06378d613beff5fd62cd5 ChangeLog 2154
-RMD160 cdd881b383db55c6c9a7e38643986fbc4250fe76 ChangeLog 2154
-SHA256 0f215ae8a1ff03db46fd42bac48ebd46bd46c8a2b347437a4b755566dc762fce ChangeLog 2154
-MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab size 158
+EBUILD haskell-mode-2.1.ebuild 1072 RMD160 199066dd9c94d2c88a8bc57254d2c1abe561ee8f SHA1 cb0bb0d469d0957c6915a0dc121a76d99df19a18 SHA256 30b0d8ea88a4eb49008a06c8cffb857f3ac203fcccff5fd6f0f23a7ee7d13cbe
+MD5 b3ce621e9c3e79a90c26c4b9b92baf1a haskell-mode-2.1.ebuild 1072
+RMD160 199066dd9c94d2c88a8bc57254d2c1abe561ee8f haskell-mode-2.1.ebuild 1072
+SHA256 30b0d8ea88a4eb49008a06c8cffb857f3ac203fcccff5fd6f0f23a7ee7d13cbe haskell-mode-2.1.ebuild 1072
+MISC ChangeLog 2397 RMD160 8e87e03d30e7e1264aec694e23015befa8399023 SHA1 60904de19550cb020c9c7966af63c21da98d6ee8 SHA256 9785522b5f17de04e4dc5d06c64cef80d05c4cba365911f32d6cc3e7ba776792
+MD5 8e033b48e8faf677c50a3b4ebd403b53 ChangeLog 2397
+RMD160 8e87e03d30e7e1264aec694e23015befa8399023 ChangeLog 2397
+SHA256 9785522b5f17de04e4dc5d06c64cef80d05c4cba365911f32d6cc3e7ba776792 ChangeLog 2397
+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
@@ -42,3 +49,10 @@ SHA256 805896a31be3f852e528d67d9961b3420d41dc2a40cbadb6db4823daaf7bec2f files/di
 MD5 b9b7e7dbbfddfb15bdfa03854debf2a4 files/digest-haskell-mode-2.1 247
 RMD160 828143535c9da716a890d2e297c69fe9c2a0346c files/digest-haskell-mode-2.1 247
 SHA256 68ce3a62b30668688bfd26ed7bfcb56ce87c53d58e4ee48c891f43d2b93da6b5 files/digest-haskell-mode-2.1 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFtJTkNQqtfCuFneMRApCgAJ45kj0tvJ1/ROW1ulirybfdPSTRPQCfd0Vl
+sft8wS++9GlCp3BQrRAQLWA=
+=oGgh
+-----END PGP SIGNATURE-----
diff --git a/app-emacs/haskell-mode/files/51haskell-mode-gentoo.el b/app-emacs/haskell-mode/files/51haskell-mode-gentoo.el
new file mode 100644
index 000000000000..4f5f9c83e965
--- /dev/null
+++ b/app-emacs/haskell-mode/files/51haskell-mode-gentoo.el
@@ -0,0 +1 @@
+(load "/usr/share/emacs/site-lisp/haskell-mode/haskell-site-file")
diff --git a/app-emacs/haskell-mode/haskell-mode-2.1.ebuild b/app-emacs/haskell-mode/haskell-mode-2.1.ebuild
index 483a9f12b9c6..7308153f396b 100644
--- a/app-emacs/haskell-mode/haskell-mode-2.1.ebuild
+++ b/app-emacs/haskell-mode/haskell-mode-2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/haskell-mode/haskell-mode-2.1.ebuild,v 1.1 2006/03/06 06:24:59 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/haskell-mode/haskell-mode-2.1.ebuild,v 1.2 2007/01/22 10:41:58 opfer Exp $
 
 inherit elisp
 
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
 
-SITEFILE="50${PN}-gentoo.el"
+SITEFILE="51${PN}-gentoo.el"
 
 # src_unpack() {
 #	unpack ${A}
@@ -29,7 +29,7 @@ src_compile() {
 src_install() {
 	elisp-install ${PN} *.{el,elc}
 #	elisp-site-file-install ${SITEFILE}
-	elisp-site-file-install ${FILESDIR}/${SITEFILE}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	dohtml *.html *.hs
 	dodoc ChangeLog NEWS
 	insinto /usr/share/doc/${PF}