change site file for Emacs to not to load too much; correct installation directory of compiled emacs support files; fixes bug 156753

Package-Manager: portage-2.1.2-r9

4 files changed, 31 insertions, 16 deletions

diff --git a/dev-util/mercurial/ChangeLog b/dev-util/mercurial/ChangeLog
index afc913bd11c2..184126439f47 100644
--- a/dev-util/mercurial/ChangeLog
+++ b/dev-util/mercurial/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/mercurial
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/ChangeLog,v 1.45 2007/01/21 09:30:58 aross Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/ChangeLog,v 1.46 2007/02/14 22:39:36 opfer Exp $
+
+  14 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
+  files/70mercurial-gentoo.el, mercurial-0.9.3-r1.ebuild:
+  change site file for Emacs to not to load too much; correct installation
+  directory of compiled emacs support files; fixes bug 156753
 
 *mercurial-0.9.3-r1 (21 Jan 2007)
 
diff --git a/dev-util/mercurial/Manifest b/dev-util/mercurial/Manifest
index ad9b3987b207..9071c99166cf 100644
--- a/dev-util/mercurial/Manifest
+++ b/dev-util/mercurial/Manifest
@@ -1,7 +1,10 @@
-AUX 70mercurial-gentoo.el 58 RMD160 f26d02718b321abc425eaa10f6cab5d46ebda04d SHA1 c55a5d41be574fbb745477098a5df929104e70ca SHA256 2aaf18f57125ac92a694590c2f901d84b2e9da926c5942e1d6513d8f43efe807
-MD5 a38f82bca74897605c8a08d980665020 files/70mercurial-gentoo.el 58
-RMD160 f26d02718b321abc425eaa10f6cab5d46ebda04d files/70mercurial-gentoo.el 58
-SHA256 2aaf18f57125ac92a694590c2f901d84b2e9da926c5942e1d6513d8f43efe807 files/70mercurial-gentoo.el 58
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 70mercurial-gentoo.el 76 RMD160 1891ab510adb464211b4cc35c5b6e4b149da79fa SHA1 72eb35d2bf86fa8f806acfbc823b88fc5188741b SHA256 c215746e4a5375569808c6aa6ddabe08e82d33d744128179be3142d9cd53a5ab
+MD5 5c6cb663ce1dd8c0a06aab7f9e661268 files/70mercurial-gentoo.el 76
+RMD160 1891ab510adb464211b4cc35c5b6e4b149da79fa files/70mercurial-gentoo.el 76
+SHA256 c215746e4a5375569808c6aa6ddabe08e82d33d744128179be3142d9cd53a5ab files/70mercurial-gentoo.el 76
 DIST mercurial-0.9.1.tar.gz 401485 RMD160 f34db5fbfcc5b3e90b2bce7577d3446f6159b057 SHA1 a1f9ed5ee96660ee9f6cff6d65c8ad8e3495702e SHA256 60329317ed96cccf3db704ef9d2554890bcff6850c305199cc0f51cef606ebc9
 DIST mercurial-0.9.3.tar.gz 530289 RMD160 9a25e508ebbe8e1827f26f6731ab085ce535f73a SHA1 a91c769ea78bffc15017a2157d05b87b9218ca40 SHA256 48485e6b16d304ef67f747c956ad257139796359ebfba9a66aede5cc0f550e86
 DIST mercurial-0.9.tar.gz 326107 RMD160 4ab0646abeea17bebf2262457448ef39959b5311 SHA1 d633a9fee89ed8aee22d5a52138c673e01feed7f SHA256 43de312de90ca5d155101d775c7bdaafc9ff61f179dd2940d8e22b2df5090a5b
@@ -17,10 +20,10 @@ EBUILD mercurial-0.9.1.ebuild 1317 RMD160 7366d23e2c975d19b72862e3cbb6e1a17b99a2
 MD5 d333517900fe3306090e137c3d078839 mercurial-0.9.1.ebuild 1317
 RMD160 7366d23e2c975d19b72862e3cbb6e1a17b99a2fe mercurial-0.9.1.ebuild 1317
 SHA256 3ced050bf79faeba309b1262305641842a08c7967bc8740c59eadf615e91da27 mercurial-0.9.1.ebuild 1317
-EBUILD mercurial-0.9.3-r1.ebuild 1783 RMD160 8d977d299e8ad034de5c8505fc512f9677d2bb77 SHA1 36a2cf35fb833196b7e067b09a038ff73de91965 SHA256 11fdc8d91d3ae41c7fbe2371db5c1c7ee637de9ee69f40571c9877d9785a259e
-MD5 b9b1be8f0791bc111e689156551348aa mercurial-0.9.3-r1.ebuild 1783
-RMD160 8d977d299e8ad034de5c8505fc512f9677d2bb77 mercurial-0.9.3-r1.ebuild 1783
-SHA256 11fdc8d91d3ae41c7fbe2371db5c1c7ee637de9ee69f40571c9877d9785a259e mercurial-0.9.3-r1.ebuild 1783
+EBUILD mercurial-0.9.3-r1.ebuild 1789 RMD160 ecaa2cdec783f5c6d0a02220a368cf7c07d5980d SHA1 7d46e8d2cdfbea6aa1255c19c65968d79e121e13 SHA256 1f4c7442e74df2907e9ce9cb3c0c328011da98c9d0dcfb71bb630c2f1b6305b7
+MD5 9a6b1122c6040af7b1d9dcc00be60ca4 mercurial-0.9.3-r1.ebuild 1789
+RMD160 ecaa2cdec783f5c6d0a02220a368cf7c07d5980d mercurial-0.9.3-r1.ebuild 1789
+SHA256 1f4c7442e74df2907e9ce9cb3c0c328011da98c9d0dcfb71bb630c2f1b6305b7 mercurial-0.9.3-r1.ebuild 1789
 EBUILD mercurial-0.9.3.ebuild 1620 RMD160 8a9ebefd5b876fff9804803b37b500f9bec65042 SHA1 6352dfaf0b074652f98120eb881b9d74fe0b1c28 SHA256 8f971a5f7b6439d0021b93d0c5ea0ff9be4d08d2a6dc1bd243c430672b8e0f7b
 MD5 2a137b0880f2be32af902c6aad65379f mercurial-0.9.3.ebuild 1620
 RMD160 8a9ebefd5b876fff9804803b37b500f9bec65042 mercurial-0.9.3.ebuild 1620
@@ -29,10 +32,10 @@ EBUILD mercurial-0.9.ebuild 1257 RMD160 1ccfd945736a978b4f601e65966a2fe6d24619a6
 MD5 7febfda4775679c3b131ef154405e373 mercurial-0.9.ebuild 1257
 RMD160 1ccfd945736a978b4f601e65966a2fe6d24619a6 mercurial-0.9.ebuild 1257
 SHA256 d9ac117c180a613646b32f5e67329032ca827eb0e0f561fcb8338f95e7908cfd mercurial-0.9.ebuild 1257
-MISC ChangeLog 6900 RMD160 86692a9f85ab270b6767bb9ad940ac6014a69f79 SHA1 84474eeaba0eeb3573988ffd93226714424197f0 SHA256 79e0ca8c2a15db77d31b4eb960c31db19f9c6e64e6b41fd58cc99e58a5f756cb
-MD5 bfba61dbba600af3afdc0fc7490762e1 ChangeLog 6900
-RMD160 86692a9f85ab270b6767bb9ad940ac6014a69f79 ChangeLog 6900
-SHA256 79e0ca8c2a15db77d31b4eb960c31db19f9c6e64e6b41fd58cc99e58a5f756cb ChangeLog 6900
+MISC ChangeLog 7151 RMD160 1be961f36ea052aceaf5cf27de64a6767ccd9874 SHA1 d811d2424a6219058991c9749473bc536f272ff3 SHA256 8831f2108852fbcaa2f6697c0ae6247d1fb8d08180a6760e298b6ab9527cb004
+MD5 39dc52a793de9367982df8cc96af3062 ChangeLog 7151
+RMD160 1be961f36ea052aceaf5cf27de64a6767ccd9874 ChangeLog 7151
+SHA256 8831f2108852fbcaa2f6697c0ae6247d1fb8d08180a6760e298b6ab9527cb004 ChangeLog 7151
 MISC metadata.xml 340 RMD160 42ed774846b1c130e10cd9f04dc238e1ad7a0675 SHA1 a09d6108a4cb533131fa1f94e30dfe3bdc8ba09f SHA256 2bfc6711bc7e8600ceab13abef10bc2ff685771122b32d161a023d8a88dd2c2c
 MD5 79b4c68340fb143d2113df9bc1861d7f metadata.xml 340
 RMD160 42ed774846b1c130e10cd9f04dc238e1ad7a0675 metadata.xml 340
@@ -55,3 +58,10 @@ SHA256 36109d2eaf1a42523e7240f06a620f2515e2e06eda31b6f4dccb08e01dde20aa files/di
 MD5 3451c87a31aad00c9aa840c3cc7a6104 files/digest-mercurial-0.9.3-r1 247
 RMD160 1e630b72f45df03b702e7e41c72f1da80133e3f9 files/digest-mercurial-0.9.3-r1 247
 SHA256 36109d2eaf1a42523e7240f06a620f2515e2e06eda31b6f4dccb08e01dde20aa files/digest-mercurial-0.9.3-r1 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFF0497NQqtfCuFneMRAgJ6AKCcpe6YkdOq8447wINj7oDuAZWNUACfZ3MW
+/ZbJA0v56DRfF1iiyUrAjCk=
+=JzWY
+-----END PGP SIGNATURE-----
diff --git a/dev-util/mercurial/files/70mercurial-gentoo.el b/dev-util/mercurial/files/70mercurial-gentoo.el
index 7ecfbddfceb0..5779a612f204 100644
--- a/dev-util/mercurial/files/70mercurial-gentoo.el
+++ b/dev-util/mercurial/files/70mercurial-gentoo.el
@@ -1,3 +1,3 @@
 ;;; mercurial site-lisp configuration
 
-(load "mercurial")
+(add-to-list 'load-path "@SITELISP@")
\ No newline at end of file
diff --git a/dev-util/mercurial/mercurial-0.9.3-r1.ebuild b/dev-util/mercurial/mercurial-0.9.3-r1.ebuild
index 62fdaa67046c..324d57bdb782 100644
--- a/dev-util/mercurial/mercurial-0.9.3-r1.ebuild
+++ b/dev-util/mercurial/mercurial-0.9.3-r1.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/dev-util/mercurial/mercurial-0.9.3-r1.ebuild,v 1.1 2007/01/21 09:30:58 aross Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-0.9.3-r1.ebuild,v 1.2 2007/02/14 22:39:36 opfer Exp $
 
 inherit bash-completion distutils elisp-common flag-o-matic
 
@@ -53,7 +53,7 @@ src_install() {
 	doman doc/*.?
 
 	if use emacs; then
-		insinto ${SITELISP}
+		insinto ${SITELISP}/${PN}
 		doins contrib/mercurial.el*
 		elisp-site-file-install "${FILESDIR}"/70mercurial-gentoo.el
 	fi