summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2014-03-13 20:13:58 +0100
committerUlrich Müller <ulm@gentoo.org>2014-03-13 20:13:58 +0100
commit5cc94ffdd0e49ed048aa5d45ef3a800ff421b664 (patch)
tree5b368b4c4e6a4480831dda6abebbf9f43d40fcf1 /app-editors/emacs-xwidget
parentInstall emacs man page under the same name as the binary. (diff)
downloademacs-5cc94ffdd0e49ed048aa5d45ef3a800ff421b664.tar.gz
emacs-5cc94ffdd0e49ed048aa5d45ef3a800ff421b664.tar.bz2
emacs-5cc94ffdd0e49ed048aa5d45ef3a800ff421b664.zip
Merge changes from emacs-vcs.
Package-Manager: portage-2.2.8-r1
Diffstat (limited to 'app-editors/emacs-xwidget')
-rw-r--r--app-editors/emacs-xwidget/ChangeLog3
-rw-r--r--app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild4
2 files changed, 6 insertions, 1 deletions
diff --git a/app-editors/emacs-xwidget/ChangeLog b/app-editors/emacs-xwidget/ChangeLog
index 8dd1a18..8cd64a2 100644
--- a/app-editors/emacs-xwidget/ChangeLog
+++ b/app-editors/emacs-xwidget/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 13 Mar 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
+ Merge changes from emacs-vcs.
+
19 Feb 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
Merge changes from emacs-vcs.
diff --git a/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild b/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
index 5d941ad..ffe8915 100644
--- a/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
+++ b/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
@@ -36,7 +36,7 @@ IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +
REQUIRED_USE="?? ( aqua X )"
RDEPEND="sys-libs/ncurses
- >=app-admin/eselect-emacs-1.2
+ >=app-admin/eselect-emacs-1.16
>=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?]
net-libs/liblockfile
acl? ( virtual/acl )
@@ -252,6 +252,8 @@ src_install () {
mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
|| die "moving emacs executable failed"
+ mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
+ || die "moving emacs man page failed"
# move info dir to avoid collisions with the dir file generated by portage
mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \