correctly use aspell when having it installed

Package-Manager: portage-2.1.1-r2

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 026cd1e9c1782478ec691c72cecfd8c891477428..ee1c88e5daf3eec053c2fcaa0beae9286ecaf908 100644 (file)
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/emacs
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.110 2006/12/04 11:19:46 opfer Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.111 2007/01/05 14:22:36 opfer Exp $
+
+  05 Jan 2007; Christian Faulhammer <opfer@gentoo.org> emacs-21.4-r5.ebuild:
+  correctly use aspell when having it installed
 
   04 Dec 2006; Christian Faulhammer <opfer@gentoo.org> -emacs-18.59.ebuild,
   -emacs-21.4-r1.ebuild, -emacs-21.4-r2.ebuild, -emacs-21.4-r3.ebuild:

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 3ad6b945578c1ccb513a329da59761d83679b61e..5d0d3e48e13c29a91b448231fc0b2d2319cc35a3 100644 (file)
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 40aspell-gentoo.el 80 RMD160 f45303b3158136e3c5c4b6039fc893697900b9a4 SHA1 90ab33e0d4a61dbc8feaabdc3dd08ec059941179 SHA256 b4d23344039e6d48efc893597295b3cacdad684c188a7fb2fada777e925f36b4
 MD5 04a64867694a98538309b433c80aaa62 files/40aspell-gentoo.el 80
 RMD160 f45303b3158136e3c5c4b6039fc893697900b9a4 files/40aspell-gentoo.el 80
@@ -59,18 +62,18 @@ EBUILD emacs-21.4-r4.ebuild 4492 RMD160 571f7409b0f65bad0715aecc91d176af1edd3443
 MD5 317bcb60bc1061bf3794a1a993730405 emacs-21.4-r4.ebuild 4492
 RMD160 571f7409b0f65bad0715aecc91d176af1edd3443 emacs-21.4-r4.ebuild 4492
 SHA256 3914a526e5560e54fd0d670f190b4032f701aa46200570279f100a38841fcb4e emacs-21.4-r4.ebuild 4492
-EBUILD emacs-21.4-r5.ebuild 4926 RMD160 4445349f8694cb820251f94cd3635137b398e593 SHA1 7c63b3b5f91e80a3c7622117b45557b8858be159 SHA256 373937dbd2ae4838f8eb698a05adecee7bd62e4b09758c1a12ce00298f0d10b1
-MD5 ffbcc303c52bd8f2e8cedb069ef017b2 emacs-21.4-r5.ebuild 4926
-RMD160 4445349f8694cb820251f94cd3635137b398e593 emacs-21.4-r5.ebuild 4926
-SHA256 373937dbd2ae4838f8eb698a05adecee7bd62e4b09758c1a12ce00298f0d10b1 emacs-21.4-r5.ebuild 4926
+EBUILD emacs-21.4-r5.ebuild 5065 RMD160 b3147487d3e9535af22b010933b85cc0389335b0 SHA1 26ffa6197cd8e9189fb10ee787ced23d62af15ea SHA256 9fa1e747a2087bf97f27211a3ec1c5fd67f8ee078cc06f85046fdf24f5a9be61
+MD5 a56fe02c52fa8ea3884fd82326720a49 emacs-21.4-r5.ebuild 5065
+RMD160 b3147487d3e9535af22b010933b85cc0389335b0 emacs-21.4-r5.ebuild 5065
+SHA256 9fa1e747a2087bf97f27211a3ec1c5fd67f8ee078cc06f85046fdf24f5a9be61 emacs-21.4-r5.ebuild 5065
 EBUILD emacs-22.0.50_pre20050225.ebuild 5557 RMD160 11e3ea0cc9bdad886ce7ecb4946925dfda0d83ed SHA1 296bba1410b3575fd1ccf54bbcef7756adc5038a SHA256 12629d258f388c211c18ed21bb65cb6479b3375913a921e85305fab8ae9bbd39
 MD5 7e17815f1e5c1a8a92e12ce8a4a20951 emacs-22.0.50_pre20050225.ebuild 5557
 RMD160 11e3ea0cc9bdad886ce7ecb4946925dfda0d83ed emacs-22.0.50_pre20050225.ebuild 5557
 SHA256 12629d258f388c211c18ed21bb65cb6479b3375913a921e85305fab8ae9bbd39 emacs-22.0.50_pre20050225.ebuild 5557
-MISC ChangeLog 16020 RMD160 4a9d2f84cdcf2767542e7a0a65c9ed266d44a1a5 SHA1 91da0f99540bed07c9849f2c07f94aee6c39e8b0 SHA256 ef4a2a6d1df4dfd30b3544c4607408b6650d10276e30d35d0195ca3f8b6d18ad
-MD5 9dcfc5fdffb71e0d78d03dbfbaa64787 ChangeLog 16020
-RMD160 4a9d2f84cdcf2767542e7a0a65c9ed266d44a1a5 ChangeLog 16020
-SHA256 ef4a2a6d1df4dfd30b3544c4607408b6650d10276e30d35d0195ca3f8b6d18ad ChangeLog 16020
+MISC ChangeLog 16146 RMD160 bf5f0126a68a7c2ee32687611029442893e5d6f8 SHA1 9e9097d4971e7fbe404808488a7a5bfe3ab5d301 SHA256 dc7ace5fc521f5415a19a2ad9baf341fbb0b762430d36f492a5564e82dd3ec56
+MD5 04fce78191ae02d120474c6877dbbebb ChangeLog 16146
+RMD160 bf5f0126a68a7c2ee32687611029442893e5d6f8 ChangeLog 16146
+SHA256 dc7ace5fc521f5415a19a2ad9baf341fbb0b762430d36f492a5564e82dd3ec56 ChangeLog 16146
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -84,3 +87,10 @@ SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/di
 MD5 56b020a4e966468679ce67d99479c7f7 files/digest-emacs-22.0.50_pre20050225 440
 RMD160 bd1c85e484649b0f59d8e862c56464ca05d82540 files/digest-emacs-22.0.50_pre20050225 440
 SHA256 263c0f93c22b5467286e5ff0054a83697b60e25ea6e3c44f38ce61fa181d97b6 files/digest-emacs-22.0.50_pre20050225 440
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFnl9cNQqtfCuFneMRAunOAJ9yEg0PaTWiKpHL29XliwUnA0vSeQCeOrx6
+e0BZ9Wp0hYoSRso/fFuIcLo=
+=XqHP
+-----END PGP SIGNATURE-----

diff --git a/app-editors/emacs/emacs-21.4-r5.ebuild b/app-editors/emacs/emacs-21.4-r5.ebuild
index 20b0f17c732927fa87bf2a9b6884b5b99450c55b..2048ea3e0caf17fcff11eea597e467f0c2bafbcd 100644 (file)
--- a/app-editors/emacs/emacs-21.4-r5.ebuild
+++ b/app-editors/emacs/emacs-21.4-r5.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-editors/emacs/emacs-21.4-r5.ebuild,v 1.5 2006/11/26 11:26:01 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r5.ebuild,v 1.6 2007/01/05 14:22:36 opfer Exp $
 
 inherit flag-o-matic eutils alternatives toolchain-funcs
 
@@ -134,6 +134,11 @@ src_install() {
        mv ${T}/emacs-${SLOT} ${D}/usr/share/info
        mv ${T}/dir ${D}/usr/share/info/emacs-${SLOT}
 
+       if has_version 'app-text/aspell' ; then
+               # defaults to aspell if installed
+               elisp-site-file-install ${FILESDIR}/40aspell-gentoo.el
+       fi
+
        newenvd ${FILESDIR}/60emacs-${SLOT}.envd 60emacs-${SLOT}
 
        einfo "Fixing manpages..."