Don't embed CHOST into symlinks in /usr/share.

Package-Manager: portage-2.1.10.42/cvs/Linux x86_64

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 3f962db227c569a3b77034348df67b2b59dc6ae6..911f618c7840fcfb295b54cd6c0bbd6cba85dedc 100644 (file)
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.448 2011/12/19 21:07:55 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.449 2011/12/23 22:20:50 ulm Exp $
+
+*emacs-18.59-r8 (23 Dec 2011)
+
+  23 Dec 2011; Ulrich Mueller <ulm@gentoo.org> -emacs-18.59-r7.ebuild,
+  +emacs-18.59-r8.ebuild:
+  Don't embed CHOST into symlinks in /usr/share.
 
   19 Dec 2011; Ulrich Mueller <ulm@gentoo.org> emacs-18.59-r7.ebuild:
   Updated patchset, including a fix for the LDFLAGS issue.

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index a179be57cfbb571c2c6b16c2de5ac6dbeadbeceb..e177554bc52d59f78a764797ff1e0a8f5f958c20 100644 (file)
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -15,18 +15,18 @@ DIST emacs-23.3-patches-3.tar.bz2 14783 RMD160 5a609bfded363d63f6146c482881d63ea
 DIST emacs-23.3a.tar.bz2 38748283 RMD160 21f201714bca420c3a8fed8c92058cec786e724e SHA1 795bdfa372e42b9589a80f6dcb2ad8fed65b90e4 SHA256 9f4beee3bf4987914d57851c0aac017cb92a1410c2b31ba313265c64a38cc6ba
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
 EBUILD emacs-18.59-r6.ebuild 2736 RMD160 23d2b7c5cbf0deb8d76035a77fe803206581a810 SHA1 997a0271b8b4114867b308843180a59ab03fcf63 SHA256 bcc584e1ee5a50c6a6539458acf0ce229f79981430fe624e4f0301c63ddaf14a
-EBUILD emacs-18.59-r7.ebuild 4282 RMD160 68a0714730589c13b91ba83c9e3d56a68dbc2a38 SHA1 4f49fa022e3c27cd8e0b1cdd7432dea3daa88cd4 SHA256 f5c6fa4fe058d9c5a54064f2bc25d12f76e52f48d52a5a5da2d7c3ee729c578a
+EBUILD emacs-18.59-r8.ebuild 4316 RMD160 6954643da594a2da8d434cc282778d12dd40a26f SHA1 d5672b8492aff936da611eb3f4a80b0892cfefe4 SHA256 1e98885c5b845223de3dfd7eff612991f6b374005c067c76853c49a0282b423b
 EBUILD emacs-21.4-r23.ebuild 5010 RMD160 2b7019a59d7ba82a320c8464c3c2b6c098410b5a SHA1 04e1932afc02456234eb46ffc0baa35681162a7e SHA256 263a626ed20b87ae8f19b136ce75f90d9f188e4a69d8bcfdbef540b419f9b693
 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 10418 RMD160 614088e8d707016d832304080cc8a18c767c85c1 SHA1 78086accf5e921d31de5da9cdc848e100776a058 SHA256 dad8aef6845189bdaa6456b046a70824041f3a24ff5d02905a3db042d309ce45
-MISC ChangeLog 64261 RMD160 5a9bd789b7b52b9fcc6e375a41e5b9e00eadb790 SHA1 bfd7c462b9bf908df918218e6101e19923880428 SHA256 c8113d2d82e6ba8cd3c49c0e2c5fd5f8d7b2489020a4b01c5827f88e13979c41
+MISC ChangeLog 64439 RMD160 3e4740030dbc3b14f69daa651cb9ae17443da4dc SHA1 61da459a13e29efde0f0ffbf8a160be2dcd21ca7 SHA256 f0b20d65822c7cd8d35ca084e089df309d14359eaaec3e425d8dee93b1197b95
 MISC metadata.xml 1644 RMD160 911d63b0a921d248984f3c5efeb1922f05aa5111 SHA1 7281388d7c274016274e888d97821fda9e5c958c SHA256 7c703ad3af721dfa1d9737f78cd848b7c69a7b906ead5c5fe8fd1db23a1d3166
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7wfxYACgkQOeoy/oIi7uzg3ACfXsvB7yTCIMSfSsGIOq8oP6qj
-AjwAn33pkfkWxUuwm3jvd8JM88qrq8Gs
-=dHDP
+iEYEARECAAYFAk71ASkACgkQOeoy/oIi7uzEgwCg10aI5qpFhUksfo1JH733/9o5
+uF4AniW8/p7PV1orPTl+HpLg+zKOkERD
+=5cHg
 -----END PGP SIGNATURE-----

diff --git a/app-editors/emacs/emacs-18.59-r7.ebuild b/app-editors/emacs/emacs-18.59-r8.ebuild
similarity index 93%
rename from app-editors/emacs/emacs-18.59-r7.ebuild
rename to app-editors/emacs/emacs-18.59-r8.ebuild
index ab21082529a4ddb50686e88a40408d4f2e131449..b70e46237b006e4ada834458090714600c68f00d 100644 (file)
--- a/app-editors/emacs/emacs-18.59-r7.ebuild
+++ b/app-editors/emacs/emacs-18.59-r8.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-18.59-r7.ebuild,v 1.5 2011/12/20 12:16:51 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.1 2011/12/23 22:20:50 ulm Exp $
 
 EAPI=4
 
@@ -80,6 +80,9 @@ src_install() {
                -o -name COPYING ! -path "*/etc/COPYING" \) -exec rm "{}" + || die
        fperms -R go-w ${basedir}
 
+       # remove duplicate DOC file
+       rm "${D}"${basedir}/etc/DOC || die
+
        # move executables to the correct place
        mv "${D}"/usr/bin/emacs{,-${SLOT}} || die
        for i in etags ctags emacsclient; do
@@ -87,13 +90,12 @@ src_install() {
                rm "${D}"${basedir}/etc/${i} || die
        done
 
-       dodir /usr/libexec/emacs/${PV}/${CHOST}
+       dodir /usr/libexec/emacs/${PV}
        for i in wakeup digest-doc sorted-doc movemail cvtmail fakemail \
                yow env server
        do
-               mv "${D}"${basedir}/etc/${i} \
-                       "${D}"/usr/libexec/emacs/${PV}/${CHOST}/${i} || die
-               dosym ../../../../libexec/emacs/${PV}/${CHOST}/${i} ${basedir}/etc/${i}
+               mv "${D}"${basedir}/etc/${i} "${D}"/usr/libexec/emacs/${PV}/${i} || die
+               dosym ../../../../libexec/emacs/${PV}/${i} ${basedir}/etc/${i}
        done
        for i in test-distrib make-docfile; do
                rm "${D}"${basedir}/etc/${i} || die