Use canonical emacs support code, thanks to opfer in bug #184249

Package-Manager: portage-2.1.2.9

3 files changed, 18 insertions, 24 deletions

diff --git a/dev-util/mercurial/ChangeLog b/dev-util/mercurial/ChangeLog
index 227985a87b8c..79df60e13da3 100644
--- a/dev-util/mercurial/ChangeLog
+++ b/dev-util/mercurial/ChangeLog
@@ -1,6 +1,10 @@
 # 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.54 2007/07/05 06:12:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/ChangeLog,v 1.55 2007/07/22 03:58:35 aross Exp $
+
+  22 Jul 2007; Andrew Ross <aross@gentoo.org> mercurial-0.9.4.ebuild:
+  Use canonical emacs support code, thanks to Christian Faulhammer
+  <opfer@gentoo.org> in bug #184249
 
   05 Jul 2007; Michael Sterrett <mr_bones_@gentoo.org>
   +mercurial-0.9.1-r2.ebuild:
diff --git a/dev-util/mercurial/Manifest b/dev-util/mercurial/Manifest
index 26b8c9584c80..8ab0bb7569f6 100644
--- a/dev-util/mercurial/Manifest
+++ b/dev-util/mercurial/Manifest
@@ -1,6 +1,3 @@
------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
@@ -20,14 +17,14 @@ EBUILD mercurial-0.9.3.ebuild 1620 RMD160 8a9ebefd5b876fff9804803b37b500f9bec650
 MD5 2a137b0880f2be32af902c6aad65379f mercurial-0.9.3.ebuild 1620
 RMD160 8a9ebefd5b876fff9804803b37b500f9bec65042 mercurial-0.9.3.ebuild 1620
 SHA256 8f971a5f7b6439d0021b93d0c5ea0ff9be4d08d2a6dc1bd243c430672b8e0f7b mercurial-0.9.3.ebuild 1620
-EBUILD mercurial-0.9.4.ebuild 1692 RMD160 2c1c7ca12679ab8b72249daaca8cca7ba1ef5fb5 SHA1 82cf087b3d222b70be840b5614f8fa162c92dea4 SHA256 b0b9185fa4d868a93252a275facd4475c79bcbb900d67cf91b4ea55ed7bd6788
-MD5 78b69cde216eefe3c335d7471593ed21 mercurial-0.9.4.ebuild 1692
-RMD160 2c1c7ca12679ab8b72249daaca8cca7ba1ef5fb5 mercurial-0.9.4.ebuild 1692
-SHA256 b0b9185fa4d868a93252a275facd4475c79bcbb900d67cf91b4ea55ed7bd6788 mercurial-0.9.4.ebuild 1692
-MISC ChangeLog 8354 RMD160 53007d02d1fe7eac32f2a2d9923fdc7c4ac21b52 SHA1 6ab88d635be9b043178975afbb7f3564bb1aee8e SHA256 6db1ae646a6f2913f307e128c6415c016cef4c46912f98cf8d96770461a74080
-MD5 7c1db0815661704f2516ec2da01aa423 ChangeLog 8354
-RMD160 53007d02d1fe7eac32f2a2d9923fdc7c4ac21b52 ChangeLog 8354
-SHA256 6db1ae646a6f2913f307e128c6415c016cef4c46912f98cf8d96770461a74080 ChangeLog 8354
+EBUILD mercurial-0.9.4.ebuild 1728 RMD160 40ded95354540cb8ebc4af2a34493b9c8c1bdb6a SHA1 de9121032cb8ddbf7c3f3262b7a2fbb5d48407a1 SHA256 2b8ebc63ca7c2926e94e694abbe45f1d3131af463fd57e65c50e315abcc32d94
+MD5 562305f6826ea25ea28d41c91859cf3a mercurial-0.9.4.ebuild 1728
+RMD160 40ded95354540cb8ebc4af2a34493b9c8c1bdb6a mercurial-0.9.4.ebuild 1728
+SHA256 2b8ebc63ca7c2926e94e694abbe45f1d3131af463fd57e65c50e315abcc32d94 mercurial-0.9.4.ebuild 1728
+MISC ChangeLog 8524 RMD160 35486e6fb716b893178815bc8f4c0a6e8ccea53f SHA1 2a42927513cc456ef7b1ec72c1ee19bfdf10ee69 SHA256 11b55d66b80746acc4b176ce63ab1cc7faec10af06bcf93753bf3e4b1a1a48f1
+MD5 d15acd5d57c530615a6731c11cbcd2fe ChangeLog 8524
+RMD160 35486e6fb716b893178815bc8f4c0a6e8ccea53f ChangeLog 8524
+SHA256 11b55d66b80746acc4b176ce63ab1cc7faec10af06bcf93753bf3e4b1a1a48f1 ChangeLog 8524
 MISC metadata.xml 248 RMD160 88010a1603151711955a2c588e2c8c77a57a39b5 SHA1 96c30e5314aa50234d118c14b86ffd3e023f989b SHA256 7e7e813a6a219769c8118573805d36fbd61ad97c57eea1fc852cf890b8740234
 MD5 784cb428b4b23cdb7fcd9969db7d341c metadata.xml 248
 RMD160 88010a1603151711955a2c588e2c8c77a57a39b5 metadata.xml 248
@@ -44,10 +41,3 @@ SHA256 36109d2eaf1a42523e7240f06a620f2515e2e06eda31b6f4dccb08e01dde20aa files/di
 MD5 1fc759fc32ad9aa812529825e4daf4a2 files/digest-mercurial-0.9.4 247
 RMD160 0c11fe1218b6454a0733c5c1c003367102228e83 files/digest-mercurial-0.9.4 247
 SHA256 b6e6dd55ad6526ee586916e21686b4313ba374c1013e84c42c54545ee0919f82 files/digest-mercurial-0.9.4 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGjKVX/ejvha5XGaMRAgw+AJ9ollED+kRvJaoy4GCgaMeYs0IeJACgyQ2r
-Y0qaNbv0NebzjWzFAdf2r1A=
-=LmQS
------END PGP SIGNATURE-----
diff --git a/dev-util/mercurial/mercurial-0.9.4.ebuild b/dev-util/mercurial/mercurial-0.9.4.ebuild
index 12f127a9bee5..d72d5bb07de0 100644
--- a/dev-util/mercurial/mercurial-0.9.4.ebuild
+++ b/dev-util/mercurial/mercurial-0.9.4.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.4.ebuild,v 1.1 2007/07/04 08:34:39 aross Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-0.9.4.ebuild,v 1.2 2007/07/22 03:58:35 aross Exp $
 
 inherit bash-completion distutils elisp-common flag-o-matic
 
@@ -20,6 +20,7 @@ DEPEND="${RDEPEND}
 	test? ( app-arch/unzip )"
 
 PYTHON_MODNAME="${PN} hgext"
+SITEFILE="70${PN}-gentoo.el"
 
 src_compile() {
 	filter-flags -ftracer -ftree-vectorize
@@ -28,7 +29,7 @@ src_compile() {
 
 	if use emacs; then
 		cd "${S}"/contrib
-		elisp-compile mercurial.el || die "Emacs modules failed!"
+		elisp-compile mercurial.el || die "elisp-compile failed!"
 	fi
 
 	rm -rf contrib/vim	# app-vim/hgcommand app-vim/hgmenu
@@ -52,9 +53,8 @@ src_install() {
 	doman doc/*.?
 
 	if use emacs; then
-		insinto ${SITELISP}/${PN}
-		doins contrib/mercurial.el*
-		elisp-site-file-install "${FILESDIR}"/70mercurial-gentoo.el
+		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
 }