ulm 14/03/15 19:56:16
Modified: ChangeLog emacs-vcs-24.3.50_pre20140228.ebuild
emacs-vcs-24.3.9999.ebuild
emacs-vcs-24.3.50_pre20140131.ebuild
Removed: emacs-vcs-24.3.50_pre20131231.ebuild
Log:
Install emacs man page under the same name as the binary. Remove old.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key
9433907D693FB5B8!)
Revision Changes Path
1.148 app-editors/emacs-vcs/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.148&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.148&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?r1=1.147&r2=1.148
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- ChangeLog 1 Mar 2014 09:43:31 -0000 1.147
+++ ChangeLog 15 Mar 2014 19:56:16 -0000 1.148
@@ -1,6 +1,11 @@
# ChangeLog for app-editors/emacs-vcs
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.147
2014/03/01 09:43:31 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.148
2014/03/15 19:56:16 ulm Exp $
+
+ 15 Mar 2014; Ulrich Müller <[email protected]>
+ -emacs-vcs-24.3.50_pre20131231.ebuild, emacs-vcs-24.3.50_pre20140131.ebuild,
+ emacs-vcs-24.3.50_pre20140228.ebuild, emacs-vcs-24.3.9999.ebuild:
+ Install emacs man page under the same name as the binary. Remove old.
*emacs-vcs-24.3.50_pre20140228 (01 Mar 2014)
1.2 app-editors/emacs-vcs/emacs-vcs-24.3.50_pre20140228.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.50_pre20140228.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.50_pre20140228.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.50_pre20140228.ebuild?r1=1.1&r2=1.2
Index: emacs-vcs-24.3.50_pre20140228.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.50_pre20140228.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- emacs-vcs-24.3.50_pre20140228.ebuild 1 Mar 2014 09:43:31 -0000
1.1
+++ emacs-vcs-24.3.50_pre20140228.ebuild 15 Mar 2014 19:56:16 -0000
1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.50_pre20140228.ebuild,v
1.1 2014/03/01 09:43:31 ulm Exp $
+# $Header:
/var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.50_pre20140228.ebuild,v
1.2 2014/03/15 19:56:16 ulm Exp $
EAPI=5
@@ -37,7 +37,7 @@
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 )
@@ -237,6 +237,8 @@
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} \
@@ -348,6 +350,9 @@
# force an update of the emacs symlink for the livecd/dvd,
# because some microemacs packages set it with USE=livecd
eselect emacs update
+ elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
+ # refresh symlinks in case any installed files have changed
+ eselect emacs set ${EMACS_SUFFIX}
else
eselect emacs update ifunset
fi
1.25 app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild?rev=1.25&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild?rev=1.25&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild?r1=1.24&r2=1.25
Index: emacs-vcs-24.3.9999.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- emacs-vcs-24.3.9999.ebuild 17 Feb 2014 21:21:51 -0000 1.24
+++ emacs-vcs-24.3.9999.ebuild 15 Mar 2014 19:56:16 -0000 1.25
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v 1.24
2014/02/17 21:21:51 ulm Exp $
+# $Header:
/var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v 1.25
2014/03/15 19:56:16 ulm Exp $
EAPI=5
@@ -35,7 +35,7 @@
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 )
@@ -235,6 +235,8 @@
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} \
@@ -346,6 +348,9 @@
# force an update of the emacs symlink for the livecd/dvd,
# because some microemacs packages set it with USE=livecd
eselect emacs update
+ elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
+ # refresh symlinks in case any installed files have changed
+ eselect emacs set ${EMACS_SUFFIX}
else
eselect emacs update ifunset
fi
1.3 app-editors/emacs-vcs/emacs-vcs-24.3.50_pre20140131.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.50_pre20140131.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.50_pre20140131.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.50_pre20140131.ebuild?r1=1.2&r2=1.3
Index: emacs-vcs-24.3.50_pre20140131.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.50_pre20140131.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- emacs-vcs-24.3.50_pre20140131.ebuild 17 Feb 2014 21:21:51 -0000
1.2
+++ emacs-vcs-24.3.50_pre20140131.ebuild 15 Mar 2014 19:56:16 -0000
1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.50_pre20140131.ebuild,v
1.2 2014/02/17 21:21:51 ulm Exp $
+# $Header:
/var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.50_pre20140131.ebuild,v
1.3 2014/03/15 19:56:16 ulm Exp $
EAPI=5
@@ -37,7 +37,7 @@
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 )
@@ -237,6 +237,8 @@
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} \
@@ -348,6 +350,9 @@
# force an update of the emacs symlink for the livecd/dvd,
# because some microemacs packages set it with USE=livecd
eselect emacs update
+ elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
+ # refresh symlinks in case any installed files have changed
+ eselect emacs set ${EMACS_SUFFIX}
else
eselect emacs update ifunset
fi
