Install emacs man page under the same name as the binary. Remove old.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

6 files changed, 41 insertions, 382 deletions

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 64a9ce95265a..03c32aaae4e3 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -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 <ulm@gentoo.org>
+  -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)
 
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index a1b67d2d7036..00668dcbcadc 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,26 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST emacs-24.3.50_pre20131231.tar.xz 23966508 SHA256 9fc75e0155feee8ef70bde0a76132aa16d8e6f8970b3723ea054239a7847816a SHA512 60bad94f3c7cd0a855479976be502a8b7f7e462c9c2e80048b7d3fc99f8c238e43e484cf5d8706c3cf3119645dee464262de127f82faa7130fe26077e3c1b6b1 WHIRLPOOL 32942de1c41cf19278a49c5c8aaebefe57484650b60f695f5b62279835578041770548d0455951fe6d9a7bf87565d25de815fd44ea9ccff1996beaea856bc57c
 DIST emacs-24.3.50_pre20140131.tar.xz 23942528 SHA256 d49baad2ea008d057236defb807499b0099d72839961ee9ac42280e8dc296275 SHA512 bbc9910261534bdcf552fb020643db98ce4764ff5ddce16ce35805163d6e5b08ce08216906f5eaee904c132709e9ac06beb35be0591b7c486c8fa9ab96ca9c22 WHIRLPOOL 0d03148b1c50f416ab8db990f30ddd1660130634e72a714f9d9a0bf83bd7f1359f726a3518786b7ea4625967eed21b5a6f6706cfba769e3f58eae1354fdba26f
 DIST emacs-24.3.50_pre20140228.tar.xz 23970004 SHA256 16cc3ae281b3a059a8af3b2d865ae0dd5da51a6f009130bc2d372b473823f959 SHA512 d432db8b6efd4e269f0203a37fd99d60c006f1256867c78a21b7027a14a5c1db39ad5cdf6550ee9b06df05d2df553818c827275b99bd5a867b81dc1e21e7ecda WHIRLPOOL c7d5b64a1530af423dcd37f9f2489c694e8516ef4c731804339d6035d20cab9f1353f73561017007387b12125dd99768e01df9b0e0d685a49e51588d68ebd106
-EBUILD emacs-vcs-24.3.50_pre20131231.ebuild 11303 SHA256 34f0a8baf8b54768437431405c00512d1cb510f6679da6a20e450ae88b82db0e SHA512 b15771f1afc166abf644f44eade42bdb3537641addafc2ed64e454e2cdf14f9ba9043fd09c4ba388f04824a236ea3faf64570dec580b678e6da15f8cce917bab WHIRLPOOL f7814917c7aba837b33d35cb03a94700d09749b4b4854f84a26f4dc2778e9df23b540be8c5fe6a5801a253bc6912a675b4f14a0d5861d4c1fe64dde10be32055
-EBUILD emacs-vcs-24.3.50_pre20140131.ebuild 11303 SHA256 e984b8953d9d6231eeadd3573b9fc6dbec4aa73b0cc0f8f3d404b8d5473de51a SHA512 3961dc3cdeb8afdc3be7bed4322d47ea6ab52b2caec6a922a7f169edfc2ec3d1371f5325229164c2ed55ad696bd4a62aff84ebfe0f6563c750ed7ac0e7e8ea86 WHIRLPOOL 852fe55c20537aa586ed99dd7c22c2b58fb4fc0d88346ce176bb84082522ee03bd4e932249a60c0460134b312ea63884211cbe383ddcaedebb114513940be045
-EBUILD emacs-vcs-24.3.50_pre20140228.ebuild 11303 SHA256 f236fa9947b64c571c06d423fe834a514233a0344571b8fc43843cefced98438 SHA512 80e7030eeff94c0478ef35f27ca5d38f4a064be5c9ab8d95bf5edaddfc1a5870ec762962297e7e91adac9f0111bf0794adb4e76b8ae20ecb3ed8a27100fbd4e3 WHIRLPOOL 2831444667cd457394bc5b1a5fcda108ce81ac8d2fd714e2a1f9b0580f1df27346a24f4fedf27e078154618b42db75e8bdb97492eb177ea98541aebacf86349e
-EBUILD emacs-vcs-24.3.9999.ebuild 11116 SHA256 9fbf472492e74f93af5a3dd27d80fd6740121197c6f05115501e541d0427bf16 SHA512 f85d9c82942ff64ea2b756955ef147851f3d25ee47b2fb0d62e6777f2e8cb9f322a4f55d2aaf3d638781e227d4c4ca3cc65bb040289057cc6d621365f149e428 WHIRLPOOL bb4a818160457894585926a3172dfce6ad981e5c32207b9ec10660da7b02b638e41702d46fda4fac12757997765e6154234f41076ef0f2174c9d3718d9a21f05
-MISC ChangeLog 75083 SHA256 f4d7c9720f010e260a2ea8c8b6b06b99a83ca92ca036f0966dc4b5d0b12f9da3 SHA512 e30a3ada00e373e80b0b440cf88d156e196099bcd20aab1365be1ae95e37ca3466d5fb56a957c4dcbd9bf5180ceba2549f870e915e4554c55327ba837152e972 WHIRLPOOL b60c0df4286294a7a469475eb8a100032887f2443f58f0c76294dde939311518ab36ccafb37a5fff0ce25284ff3ac0e80d31d27c382edbbf794c1dabfcb527a1
+EBUILD emacs-vcs-24.3.50_pre20140131.ebuild 11575 SHA256 42b82c1644fd3820115c21e83b7812e4b2d75250eff37926b7e66a9560934b41 SHA512 b31e3cc1d81990df31179ad4853aadebbd7fddcbd92aa779ae331b64bb3c60558b769cf5c3cd8ebfca293f09c8e116c457444cf2ee14affb6338885133710744 WHIRLPOOL 87c1499ee31a6109ff52c705732d42298f4ff14e6610cd0db0ad834ece882dd01a847c3a9750ed5b27bda0690566d9478e61a25832b4edca78af8f6b6449c1c4
+EBUILD emacs-vcs-24.3.50_pre20140228.ebuild 11575 SHA256 eeb31c7be8622a2e5d47ac355b55b19932fefdb617ad5fca8565d8fca90d93c3 SHA512 be19bd20f70984b9dd8889d502a8541b88b5828ce6054c5f1229128c520d7edb5296f82822cbbe3e44963c7d517b85560b8c5dbc91526492a2eca3a300cac0be WHIRLPOOL 3806b4e9bc92f38ac265430dc8554267f131f0e80b6c0f7a7d3bdd9183464022fe7ffb8ca7df7b5a77cd9f0895a22f18ff58f5de315c8f77e7cd91f6ecca0b8e
+EBUILD emacs-vcs-24.3.9999.ebuild 11388 SHA256 223744002d91df9c336bbb5193b915d6f032464864df2ef8c17d3a9f772a3439 SHA512 4c8344ddf801da4d751d910541df7fb86f32158ff46bfb787149ce5e6b02f709b09638f0e21746e85b146b94148b5b721698336122ce8e328c4ec6cd1eb2f1a2 WHIRLPOOL 0b68834174f59b6839c9726f3e9494983544be8abe0fe437b506e1b1bd8a694d5ab024f15c5db17d5eb6d6356bd3eaf75e39f61684d28060f0f22971e9d4e807
+MISC ChangeLog 75350 SHA256 51026f92f4796886084fc69dc6c5075690008b15fec200dd614f1fcd5a94f96b SHA512 1d1f3d60539d141b2f019ccb220cae553277cc3ec4f58ca0774b2a848df5408ce7044ed958d4f442feadece61c151eb2014746167a7f8849f0901941af882da6 WHIRLPOOL 675004e8aa0f68d3e769e6059f7af7b49e046937b40d04b66ca5526f7237009fedeeba0dd015f526429e78e85e24b005aaae7fc84c663772c25761818f90dd63
 MISC metadata.xml 2522 SHA256 0dcfb3cd3457215ad785b82adfd0d60eafc10df3ac58c9125f6006e4ac90ced6 SHA512 8fefab8f3644c38b5a5c37e8aba2ee45a0b329b4dd846d280ef33893d940892abaf09204bf807d98870106677caf48e376667a4f2bf7c1dca26e72b6b5ea2c54 WHIRLPOOL b40fe229764c94b5bf59eda550e9a480a9793f3a4df43fa65c0dea518ad2372faf3276ce6009ad44a02907c2df63068b9596fc39e53cc7214dd5b30750df9a8d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQGcBAEBCAAGBQJTEa0xAAoJEJQzkH1pP7W4EdAMAJJjHnKXAi8V8ZbkxYvTw0l2
-DdBDGcqbNQbAJpiyaNnOEbfmuzWEZ6hO2S2igNqNP1HUVBTc04/lb+fffwpZMquu
-07mnndRoAK4BV/6DnSk+fNw6uQsqDxHAfgXyCVAEhQsxLRphMjQG2CzUlye0Noq/
-lvucX9ixLLH9m+T5+Q0wxSNDGcuUAeCjLt5foFLp3aPq8K2WsEkdPHEJKVNhR9F2
-3CynVW+4Nx2EuZmF5NEQWrXmDB2VLLqCcKZ0gpOZMJK7a8I5+S2WktuXa6pNItWY
-g63svtOVZtR0WnAGYo3idBe+mnV9io0d5CMeGeYyXO/mcbrOCoAhvbBfwkKEcY8M
-q6nWS+CUorbdOzkd6nk+BPHBecZqaT8bfYtY2a+X+pq39MP6GUeRkTi2ceueUS3U
-dIToKyznfWSbHdFG7ZJS9P/PZA/mDLlZvzvZUCeGCf1dnCxSqrAoiOtDnk9xVYPJ
-b5G4CutyEjlTcaMPJJpWecoLrOFc9NEii8xSA+AxBA==
-=ubHZ
+iQGcBAEBCAAGBQJTJLHsAAoJEJQzkH1pP7W4X+IL/RUKIC5Fi1mcOfTHgnmT4qoN
+2kWQJnQSWAAyzGNH7Vm7IsuLZWtTJACzIAjGMw81/mJRzwb3rwadGf5MlFgyfKos
+3QDUwIbWl0AIumqfZ+yTp7IL6jwG/Cvo9HD/DM7CXQuJXzhrt8/AvUr8h1pOYaVh
+DomVDkCmasNJF8BImyyV8FMHF/6MyZFDJgps/iPGlPh/QmIbmmiAdfZmbMsiiwTs
+YRCyGIrLZtaKOCRhKSqFTzJxbUlW7EW7Eeoyb0oOLjND+O85OV0epS4X9p7s7/Wu
+gORVrNwMYZZeRKUQ03TQj/o2phaIcyF8m4sFk+niiID5dS1EXTSi/63pNvUBq1lf
+2ldO4e6RW68XsD7zgjzmmodgxk1Y/+0dqBKWgT3Z3vFwS4S0X4vLDuprwmSuH49m
+40IkHLnHE0KflVR4/89I7OLh2PwoPrnH7IBbu3HSmFd0Iu0cgIt/kdH8t0zmMsZD
+B1VfaJ3eQBis8rO/sThDWw9ikguNxowabXp8CQLGhA==
+=vGRv
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.50_pre20131231.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.50_pre20131231.ebuild
deleted file mode 100644
index b0496db5d478..000000000000
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.50_pre20131231.ebuild
+++ /dev/null
@@ -1,359 +0,0 @@
-# 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_pre20131231.ebuild,v 1.2 2014/02/17 21:21:51 ulm Exp $
-
-EAPI=5
-
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
-
-if [[ ${PV##*.} = 9999 ]]; then
-	EBZR_PROJECT="emacs"
-	EBZR_BRANCH="trunk"
-	EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EBZR_BRANCH}/"
-	# "Nosmart" is much faster for initial branching.
-	EBZR_INITIAL_URI="nosmart+${EBZR_REPO_URI}"
-	EBZR_UNPACK_DIR="${WORKDIR}/emacs"
-	EBZR_WORKDIR_CHECKOUT="t"	#434746
-	inherit bzr
-	S="${EBZR_UNPACK_DIR}"
-else
-	SRC_URI="http://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
-		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	#S="${WORKDIR}/emacs-${FULL_VERSION}"
-	S="${WORKDIR}/emacs"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="24"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses
-	>=app-admin/eselect-emacs-1.2
-	>=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?]
-	net-libs/liblockfile
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	gfile? ( >=dev-libs/glib-2.28.6 )
-	gnutls? ( net-libs/gnutls )
-	gpm? ( sys-libs/gpm )
-	hesiod? ( net-dns/hesiod )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	selinux? ( sys-libs/libselinux )
-	zlib? ( sys-libs/zlib )
-	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			gtk3? ( x11-libs/gtk+:3 )
-			!gtk3? ( x11-libs/gtk+:2 )
-		)
-		!gtk? (
-			motif? ( >=x11-libs/motif-2.3:0 )
-			!motif? (
-				Xaw3d? ( x11-libs/libXaw3d )
-				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	alsa? ( virtual/pkgconfig )
-	dbus? ( virtual/pkgconfig )
-	gfile? ( virtual/pkgconfig )
-	gnutls? ( virtual/pkgconfig )
-	libxml2? ( virtual/pkgconfig )
-	X? ( virtual/pkgconfig )
-	gzip-el? ( app-arch/gzip )
-	pax_kernel? ( sys-apps/paxctl )"
-
-if [[ ${PV##*.} = 9999 ]]; then
-	DEPEND="${DEPEND}
-	sys-apps/texinfo"
-fi
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT(emacs,[ \t]*\([^ \t,)]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EBZR_BRANCH}"
-		einfo "Revision: ${EBZR_REVISION:-${EBZR_REVNO}}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	epatch_user
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-		|| die "unable to sed ctags.1"
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	strip-flags
-
-	if use sh; then
-		replace-flags "-O[1-9]" -O0		#262359
-	elif use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if use X; then
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
-	fi
-
-	# Save version information in the Emacs binary. It will be available
-	# in variable "system-configuration-options".
-	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
-	if [[ ${PV##*.} = 9999 ]]; then
-		myconf+=" EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}"
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-gameuser="${GAMES_USER_DED:-games}" \
-		--without-compress-install \
-		--with-file-notification=$(usev gfile || usev inotify || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with gnutls) \
-		$(use_with gpm) \
-		$(use_with hesiod) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with libxml2 xml2) \
-		$(use_with selinux) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake
-}
-
-src_install () {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
-		|| die "moving emacs executable failed"
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{applications,icons}
-	rm -rf "${ED}"/var
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
-	X
-	;;; ${PN}-${SLOT} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share/info
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS
-
-	if use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
-	fi
-
-	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-		through the Emacs eselect module, which also redirects man and info
-		pages. Therefore, several Emacs versions can be installed at the
-		same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Project:Emacs/Xft_support
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	if [[ -f ${ED}${infodir}/dir.orig ]]; then
-		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	elif [[ -d "${ED}"${infodir} ]]; then
-		# this should not happen in EAPI 4
-		ewarn "Regenerating Info directory index in ${infodir} ..."
-		rm -f "${ED}"${infodir}/dir{,.*}
-		for f in "${ED}"${infodir}/*; do
-			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
-				install-info --info-dir="${ED}"${infodir} "${f}" \
-					|| die "install-info failed"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-
-	local pvr
-	for pvr in ${REPLACING_VERSIONS}; do
-		[[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
-	done
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.50_pre20140131.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.50_pre20140131.ebuild
index 0dcebf262d13..53f513fd2d8d 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.50_pre20140131.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3.50_pre20140131.ebuild
@@ -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 @@ 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 )
@@ -237,6 +237,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} \
@@ -348,6 +350,9 @@ pkg_postinst() {
 		# 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
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.50_pre20140228.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.50_pre20140228.ebuild
index cb589bdd1639..84d5e6cec65d 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.50_pre20140228.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3.50_pre20140228.ebuild
@@ -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 @@ 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 )
@@ -237,6 +237,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} \
@@ -348,6 +350,9 @@ pkg_postinst() {
 		# 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
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
index 8871de465d69..7e387694c43d 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
@@ -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 @@ 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 )
@@ -235,6 +235,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} \
@@ -346,6 +348,9 @@ pkg_postinst() {
 		# 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