summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2011-12-23 22:20:50 +0000
committerUlrich Müller <ulm@gentoo.org>2011-12-23 22:20:50 +0000
commit374cfece31d7d0a0a479f9d6068793eb43314c03 (patch)
tree50f738db2d39ec896904894e51978d1f6e2ae4d4 /app-editors
parentChangelog update (diff)
downloadgentoo-2-374cfece31d7d0a0a479f9d6068793eb43314c03.tar.gz
gentoo-2-374cfece31d7d0a0a479f9d6068793eb43314c03.tar.bz2
gentoo-2-374cfece31d7d0a0a479f9d6068793eb43314c03.zip
Don't embed CHOST into symlinks in /usr/share.
(Portage version: 2.1.10.42/cvs/Linux x86_64)
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/emacs/ChangeLog8
-rw-r--r--app-editors/emacs/emacs-18.59-r8.ebuild (renamed from app-editors/emacs/emacs-18.59-r7.ebuild)12
2 files changed, 14 insertions, 6 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 3f962db227c5..911f618c7840 100644
--- 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/emacs-18.59-r7.ebuild b/app-editors/emacs/emacs-18.59-r8.ebuild
index ab21082529a4..b70e46237b00 100644
--- 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