The upstream repository has been branched for the 24.4 release. 24.3.9999-r1 is the live ebuild for the emacs-24 branch, 24.3.9999-r50 for the trunk.

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

4 files changed, 385 insertions, 14 deletions

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 03c32aaae4e3..68147bc8a0ab 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,6 +1,14 @@
 # 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.148 2014/03/15 19:56:16 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.149 2014/03/20 18:53:27 ulm Exp $
+
+*emacs-vcs-24.3.9999-r50 (20 Mar 2014)
+*emacs-vcs-24.3.9999-r1 (20 Mar 2014)
+
+  20 Mar 2014; Ulrich Müller <ulm@gentoo.org> -emacs-vcs-24.3.9999.ebuild,
+  +emacs-vcs-24.3.9999-r1.ebuild, +emacs-vcs-24.3.9999-r50.ebuild:
+  The upstream repository has been branched for the 24.4 release. 24.3.9999-r1
+  is the live ebuild for the emacs-24 branch, 24.3.9999-r50 for the trunk.
 
   15 Mar 2014; Ulrich Müller <ulm@gentoo.org>
   -emacs-vcs-24.3.50_pre20131231.ebuild, emacs-vcs-24.3.50_pre20140131.ebuild,
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 00668dcbcadc..81d250e37cb0 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -5,20 +5,21 @@ DIST emacs-24.3.50_pre20140131.tar.xz 23942528 SHA256 d49baad2ea008d057236defb80
 DIST emacs-24.3.50_pre20140228.tar.xz 23970004 SHA256 16cc3ae281b3a059a8af3b2d865ae0dd5da51a6f009130bc2d372b473823f959 SHA512 d432db8b6efd4e269f0203a37fd99d60c006f1256867c78a21b7027a14a5c1db39ad5cdf6550ee9b06df05d2df553818c827275b99bd5a867b81dc1e21e7ecda WHIRLPOOL c7d5b64a1530af423dcd37f9f2489c694e8516ef4c731804339d6035d20cab9f1353f73561017007387b12125dd99768e01df9b0e0d685a49e51588d68ebd106
 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
+EBUILD emacs-vcs-24.3.9999-r1.ebuild 11393 SHA256 3f6fbe8baf213ef5a0b1679e4ecbb92f1920b7419c52972c9e3d445fee4688c3 SHA512 ed364a5a71317c77a964006e6c1b035f299673eb151ecc0351cdc557a7fad52b70a4903eb4042616818cd7c40ccd2902b61228576822178815a9a4c3a6511118 WHIRLPOOL 3c98b4bc0da231f18b47c40faa999065af2bdeb62a7a4bb6d46ed46b5344bfebd4ee63094d1d2532980ea119af7c3bf9b22de942a3f8c863ebb45ca844ba4a5d
+EBUILD emacs-vcs-24.3.9999-r50.ebuild 11391 SHA256 23c5a753947a70ee2d02f483364e1399858db6d012b4b6306cc6acfb5d2a2890 SHA512 e3f2d6e8415a8775a270a2528f6b0ebec3168080f5c021b0c39818ac8a6c13577d912db35fceac51cdd54c63d93718d67cf4f02835b925fa063f69ebf770dcb3 WHIRLPOOL 63d59d89dbd47a24ee3f8cb4f213aaf22edd49ea6fb6e52296034a42b7a6b9ebe022e261480e7f2107d65a9c24fb3d38256a0e4734802666664c89183e92d3e2
+MISC ChangeLog 75726 SHA256 6e5a915dd4eeaae4b8bf0df37859f0653ad1e0fdcfce9203b5e07fac104fe4ac SHA512 eaa66123bc9d0cd33174f024b4de1cf9e09be18c7a836e9a7ea6a05197d0a13a8cbde22298ccecf43b4bde544b1a091b4cbe57ea582f9328e41de13066a4ea3b WHIRLPOOL 156ac59ef26e7359eecd0f2305035361b89b0eba416023c9cd93b688fcf5129b367b5a3a6b4f4f2501c03d071b0779361da8803cbfeccea3a6e44be872635071
 MISC metadata.xml 2522 SHA256 0dcfb3cd3457215ad785b82adfd0d60eafc10df3ac58c9125f6006e4ac90ced6 SHA512 8fefab8f3644c38b5a5c37e8aba2ee45a0b329b4dd846d280ef33893d940892abaf09204bf807d98870106677caf48e376667a4f2bf7c1dca26e72b6b5ea2c54 WHIRLPOOL b40fe229764c94b5bf59eda550e9a480a9793f3a4df43fa65c0dea518ad2372faf3276ce6009ad44a02907c2df63068b9596fc39e53cc7214dd5b30750df9a8d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-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
+iQGcBAEBCAAGBQJTKzq/AAoJEJQzkH1pP7W4lIcL/jb0P56uvPRGNWSTbgiA0ThM
+5pA5ycreOI33Doicr7kEZ7FQqKhTOI2moQjcCfR2wu7p7jYfrWPOEN7Kk/ExttiF
+Z0Bi1v+aWkNsBOa4TJ5gMV5rwFhw/Z2qiwHBGoGAL6hFOGz28CwiT+qCxy8i2Daw
+v4Fu0SKCgYuHtlDGUZgwyly2+b1ujU9iVhF3iBdP/3JLT+c6P+sJSPoKhUhjxCWW
+bwASjVbvmv4Jq3vVJ7O7iV4rrjxNnUmzG9NuIYdGHCGz84xOOtLyH/T+7AYmaumD
+Qg2IXLiA9r6sl+2NihyiOj2pI1aJvM7j3EiUOpkiptK47SCTmvDdDnQ8UMkXz8D3
+5aoKLTLo5MvyEZKL4BMGtQ8+Twdjcgqecs8pazBQF5i3NUMFn4uDw+F72xvZ2soe
+LDlwKl0NKqEUpL9MkGnnJP6Fn7bTKI6+rS2DkPVT1CY56KCnB2tra9osD6IMa5sz
+QKsUAH4f0KQTRIKbk/PRMmoZo69MZeCC4xjpUdcWsw==
+=dhdT
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999-r1.ebuild
new file mode 100644
index 000000000000..b6dd52c967f9
--- /dev/null
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999-r1.ebuild
@@ -0,0 +1,362 @@
+# 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-r1.ebuild,v 1.1 2014/03/20 18:53:27 ulm Exp $
+
+EAPI=5
+
+inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
+
+if [[ ${PV##*.} = 9999 ]]; then
+	EBZR_PROJECT="emacs"
+	EBZR_BRANCH="emacs-24"
+	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}"
+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"
+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.16
+	>=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"
+	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} \
+		|| 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
+	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
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999-r50.ebuild
index 7e387694c43d..5d2f4cb59606 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999-r50.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.25 2014/03/15 19:56:16 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999-r50.ebuild,v 1.1 2014/03/20 18:53:27 ulm Exp $
 
 EAPI=5