Fix out-of-prefix issue due to locallisppath, thanks MATSUI Tetsushi in bug #394707

Package-Manager: portage-2.2.01.19941-prefix/cvs/Darwin i386

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index a179b034d6811b7a7fc743e8ffa9aa405efb7fb2..24f08411512cfd0cb5c1dbe1f25883545fd83884 100644 (file)
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.444 2011/12/14 13:14:31 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.445 2011/12/14 18:31:35 grobian Exp $
+
+  14 Dec 2011; Fabian Groffen <grobian@gentoo.org> emacs-23.3-r3.ebuild:
+  Fix out-of-prefix issue due to locallisppath, thanks MATSUI Tetsushi in bug
+  #394707
 
   14 Dec 2011; Ulrich Mueller <ulm@gentoo.org> emacs-23.3-r3.ebuild:
   Remove Emacs-23-CEDET-grammars from LICENSE because we distribute the grammar

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 06e666616821db52658759133b3f0e91699fd718..0fa98a6acc993d6b56e12dc19a78298cee81cdc2 100644 (file)
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -18,13 +18,13 @@ EBUILD emacs-21.4-r23.ebuild 5010 RMD160 2b7019a59d7ba82a320c8464c3c2b6c098410b5
 EBUILD emacs-22.3-r8.ebuild 7832 RMD160 d74e25b91dbe8783930d1647dec3cf8e44b49b17 SHA1 92e6d6b50578faf6f669e6b2389d7599712048e9 SHA256 b9a75b8b6f468f984441ab725779ff581c8ddbfa14ccff404cc11381d0db741b
 EBUILD emacs-23.3-r1.ebuild 10301 RMD160 885b752594822d1425e3afe95e997ea9fb5a2776 SHA1 90bcec933661eb0f5066a6ae679ecdb6b7ac42d0 SHA256 93cf3fe5516ed9b9f0e06ae9de0472e55c47d89d0c7824da5269e71d548e4d0c
 EBUILD emacs-23.3-r2.ebuild 10656 RMD160 015444a016093e78a11dec0ad71857e1fcc7ef61 SHA1 600b0741c75f0bc0ab246380ce1d105c83186cd3 SHA256 821938b07f1303e0b0a2a8751f1d98760c4623bb87817c722c9f8e60a9f6d106
-EBUILD emacs-23.3-r3.ebuild 10394 RMD160 a663cd5f00d97188a412f3ede9da8a90a4043a2c SHA1 ae9437d9c40519ce84103f3410a0fdd64cc89aab SHA256 8d21bddda36ad67df6a1ce88f79dcf73d6a1615c408f7bc070f9ad40252f73f2
-MISC ChangeLog 63632 RMD160 ca5a4a36bbdb81c541b677eff451ec8214bcb484 SHA1 078b155c27b5b20852e07abfeff9ce9feecaedb8 SHA256 96e84086682aff35f00f9f4cca65dd9d44ece47a47f4985547b3bafff5caee24
+EBUILD emacs-23.3-r3.ebuild 10418 RMD160 614088e8d707016d832304080cc8a18c767c85c1 SHA1 78086accf5e921d31de5da9cdc848e100776a058 SHA256 dad8aef6845189bdaa6456b046a70824041f3a24ff5d02905a3db042d309ce45
+MISC ChangeLog 63798 RMD160 166a28aabd57490637427fd52f828c15b045b038 SHA1 174e9b4c54e25800cf43da3b429fca4c9010b72b SHA256 e5641e6d666dc9a4b42136448b4faf3b2ec3adcf52304eb7c82706109cf4aac0
 MISC metadata.xml 1644 RMD160 911d63b0a921d248984f3c5efeb1922f05aa5111 SHA1 7281388d7c274016274e888d97821fda9e5c958c SHA256 7c703ad3af721dfa1d9737f78cd848b7c69a7b906ead5c5fe8fd1db23a1d3166
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.18 (Darwin)
 
-iEYEARECAAYFAk7oo5MACgkQOeoy/oIi7ux8XQCdGq2GxXPpKcgxxt5+OwGphIJh
-hLEAoLfvbMsKqPwFXCTv8R6w+GLsFPcD
-=eB1E
+iEYEARECAAYFAk7o64wACgkQX3X2B8XHTolbagCgiHUKD3UMXDI5Mw0N/15KXtxk
+z9AAnivepdD4P2OopiC01M7ZHJaq1yjT
+=aGWK
 -----END PGP SIGNATURE-----

diff --git a/app-editors/emacs/emacs-23.3-r3.ebuild b/app-editors/emacs/emacs-23.3-r3.ebuild
index 2c11eff13fa7b637e23c7511e98aa5e382957a42..1ecafcb663f56641b74da6ca69cfc69f013d4a08 100644 (file)
--- a/app-editors/emacs/emacs-23.3-r3.ebuild
+++ b/app-editors/emacs/emacs-23.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r3.ebuild,v 1.2 2011/12/14 13:14:31 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r3.ebuild,v 1.3 2011/12/14 18:31:35 grobian Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
@@ -183,7 +183,7 @@ src_configure() {
        econf \
                --program-suffix=-${EMACS_SUFFIX} \
                --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-               --enable-locallisppath="/etc/emacs:${SITELISP}" \
+               --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
                --with-crt-dir="${crtdir}" \
                --with-gameuser="${GAMES_USER_DED:-games}" \
                $(use_with hesiod) \