Snapshot of trunk.

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

3 files changed, 387 insertions, 12 deletions

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index bf7f650d3393..79cb78559f15 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.155 2014/04/12 20:33:05 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.156 2014/05/02 07:51:57 ulm Exp $
+
+*emacs-vcs-24.4.50_pre20140430 (02 May 2014)
+
+  02 May 2014; Ulrich Müller <ulm@gentoo.org>
+  +emacs-vcs-24.4.50_pre20140430.ebuild:
+  Snapshot of trunk.
 
 *emacs-vcs-24.3.90 (12 Apr 2014)
 
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 5a1531e944da..2b1947e66107 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -3,23 +3,25 @@ Hash: SHA256
 
 DIST emacs-24.3.50_pre20140331.tar.xz 23995832 SHA256 566dad818e037920a46313b7408047ab68aaee5b25b2453cefae59c4a34252d8 SHA512 1cb120f57a91e4c108e89d1a60bdfc402512c7c94ed1d39b22baf891c4924427dbe77a4e84b1ebbf844c5b86ca23287073646cdb6ea2c8cb430333f474ca630f WHIRLPOOL a9c0c3a8b14c5e51c19df963111ce4e7c8e0dadebacd1000f1bc761a8ae7ca58e73adfde44068d3c7696fec33b13bad900d0c47767493f95c3fa4115e2cf3bef
 DIST emacs-24.3.90.tar.xz 39407604 SHA256 f82ed8db1e225b760eba09ab37a5a908160e7e76158143bc0d0ac23fd0e6a30f SHA512 e80cddb621c2eb104f8fbd64ad1fe5b1f60717a5f5484f724fb7d39704a74ee6dfc353087afde72fd3d16f919c1e4ad014817c4368d8d51cef4ae3a4cc7e1341 WHIRLPOOL 73e94dfb44c18e97afcab07ba0845cfb699e13ae184513671c01974ed02438cbc097804e471f4ad07e20f0544f874b302c7174960bbf19d9c06d6a10a5657d79
+DIST emacs-24.4.50_pre20140430.tar.xz 24016580 SHA256 e522b45f98ff2156696d6950eadf62d91096022b6ae16bd661652e5248fce64c SHA512 51eb12e9d6040aa7bd4377eb51c062c46df8756b97e54bd6f086a093ea4ee7a43ae62025866ee2c1a0b4c46feb7c9dd9719033a19126803f79ddeddf0ae150e5 WHIRLPOOL a1a747bee4bccbea114a7af9791b55dc6be1cfa452f7181b31a927c46d5bf07d8ebc3865cc3cf50c03869cacf0031d63d1dbf6bd6b6a3000c25eab40a59e3389
 EBUILD emacs-vcs-24.3.50_pre20140331.ebuild 11597 SHA256 c1f1ab3766624666b66f16219cdd7bc8fd1c7ba044be829c88d40ec18c4daf80 SHA512 f81973289c215f1be68fa55af667f68e046933dad047db7c8c7d5085fe6467b5a79e73badc0a6f3f56dbc452e7fc9bc533bbcf8a82cbd74ad4966a9401c1cfcc WHIRLPOOL 8d237f4fc04cd30ef92b3107ca1a968b37c8877cacc401a1ebca44e91068dd2e08f04e25032f4cbf57279b9a520a863f6e4f5673ee1a1e3846e5454ac5979667
 EBUILD emacs-vcs-24.3.90.ebuild 11562 SHA256 b8a90e6047e18d7fd493d6acaa001db790fefc9f6fc4dda45c36f194b7b26344 SHA512 c8a8c21607db2e3b0312fcf01ca503c6177dce3df8323b7f657b5c280d4b61d1534f88eb3bcabb3eadaab60bfba033fbb0438508c13468ad4bcb75a577ed62a2 WHIRLPOOL cddfb4a75b4bf3d172a23b5453c203f08169dbb10dce31328fa92793fc1572bba73f1b363468cc2977099fef2a701cbe677016473ddd2f3e139f6d8721885f51
 EBUILD emacs-vcs-24.3.9999-r1.ebuild 11412 SHA256 478a980565e2a0f87a45b4637dabfb0b93f83719af77959bc6a04c668dbf1c98 SHA512 633efab8f4832e70c80024f81716ddda154e32351081d783c24dcec422e3ef46695d6401c6854240200dbe16c01fd853dbdcd6a34244182c33f0bfc21fa2375a WHIRLPOOL 37f300819edba20998889f04f52f96e400b61b6cd68fc7ff0791b983eb50098d0dbcfba67fa4f3f725c3a07a029006963cf54644ced1140f632d7282882e5065
+EBUILD emacs-vcs-24.4.50_pre20140430.ebuild 11594 SHA256 726fbdb557f8046072e7a82f02f8521c3665bfb2030e2691bb4cd20f7a4f7f20 SHA512 d5515815e69fed7ec771ecb9005b917cabf8e22136dcce6fbeefa9f431dbfc5d712321cab910a92574f327cf6f1452e199e810b0a3ae5da358d9a5091b9b6cd3 WHIRLPOOL 78f9b3cbb30b2d47f05e7da7c1789484163671aed0246509f20b8194b1f15d2a98ee6f70b555a9d8f8521c7a10ad2854322acd4f42c6fd4cc41fcd685f06f84d
 EBUILD emacs-vcs-24.4.9999.ebuild 11406 SHA256 6b1e95e599cd3bded440517cb4f3d9888e888f0ee21e11f6ec900ee4218675e3 SHA512 01b292477d5e2f3ea781727d20abfb474abaaa6c8a238acb4cccba788e78cb9f81ed217e21897095ae8e479406609ba506617ee5a6a7061b4e42bc59b89c0038 WHIRLPOOL 1230e9323bebb8b285ca9aeec00108cee1b31af024db99b18342cce6bc81b70f8d8b607c791d63d0a72d07afa2763d8421220d5ea345dcf930aeb1cae381f273
-MISC ChangeLog 76851 SHA256 c99707c2187f40454e5694b293fe1978eebe118f13a60db31937e6da9c23c1c5 SHA512 4b4a5655bbcc5439f7579199c20d5b69a1407c75d50d6b856bfbe46d2d64ae7b683d651dada15c190f593c675147f5fd3b0ad7e1ffaa58405503a6300ba00bce WHIRLPOOL ef6f82c56bdae1cb1cdcca4b0eca49eec3d8154a40596c6e2e2adad0dfaeb3f80730487a3a49ddeee90eb33b9b26068a44b0f1041ac1ef9c36cbf148b8b8dad3
+MISC ChangeLog 77007 SHA256 f0317be098ba8497449d6a6a8bfb5048aa3f5c12e32d96da43e23cf7ab7a5b70 SHA512 dcb88c343d446f13b9343fe3f3cd33c388a7e31e1ab5d1483d255de8f99489d9e356ebf5a2a37666f076d66b80beef1e45f904015c5daa4b9a80105cac62bc25 WHIRLPOOL 0f2b8dd7c1faa2e79254b021735aebc05b86b4297b94b220c70712f18d47e5678c8f46f53ee0960b1985d8a46d2c51c4780edc6d6b228684a8d1cd6fdc6f35af
 MISC metadata.xml 2522 SHA256 0dcfb3cd3457215ad785b82adfd0d60eafc10df3ac58c9125f6006e4ac90ced6 SHA512 8fefab8f3644c38b5a5c37e8aba2ee45a0b329b4dd846d280ef33893d940892abaf09204bf807d98870106677caf48e376667a4f2bf7c1dca26e72b6b5ea2c54 WHIRLPOOL b40fe229764c94b5bf59eda550e9a480a9793f3a4df43fa65c0dea518ad2372faf3276ce6009ad44a02907c2df63068b9596fc39e53cc7214dd5b30750df9a8d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQGcBAEBCAAGBQJTSaTAAAoJEJQzkH1pP7W4g+0L/icC3fXFsMVPsrSGbJrGEBFy
-M66JpVGtYrMHvvfE2LP/Gxq+asPT2jrGc0YRB+wgTkAyLZdMw+oGZZZGfF+SZb6X
-hWf3jmABe7Z/XGWGEFb2ZaoXSmNibfeEp3HRTacudaQvaTpEuf8YSp2r1Kes/VR/
-Ag6a5/Z7sZ8XRm/kRgr7ztGfZACDSEvLEnHLFGCxhTnqOCYH+Ye3wHibkG9KyypQ
-DL1HMyZ9+MrKyrqN+R5/2t5gpnY3QYkrqoHIZ5IvAQboKwemhyoHs01g7i0mtI5i
-06qIZxTGZFydnuh6BS//qemtmRB40wVDHMzQD+HqM0eQfwva1IdZe6dO3nJBd34+
-o/E9LcIRhygh7Lfb7cNTFuU0xOJsOlosibhztnZ4kaWspUo8g7SMjxLIb1vTvxN1
-RYJWRIws+JClqUdXKOCqmY1vKGg6pL2m3Lc9OkBkWdgv5lgbqGgPZ1O41A8cczhz
-JHOYTn3ZS6OnmabVrDqaCc8WAlVCzL1MnF/XQvNcpA==
-=dIUh
+iQGcBAEBCAAGBQJTY06sAAoJEJQzkH1pP7W4tdEMAI2MrLFC5jorPvMyrRY8uvAk
+2ZoE7W9WfURsQOjaowIC13EqGUXQwe80AYXgNX2TGQWCERvpidoGV4ISbVPthivU
+XIw7m0hzlBJyEGsYE3/lG/iAkprWGVhCecAo7Se1zf6pesjdNagUJrLbPx9rfXvW
+co8M2G4FV6FXdiCX0U2UWtpyevJHw2gQxgIGuEfBz035GHc/3CvOiU6EN0ZqSkKO
+o5WuSjyiMgPoKhfiV/4cNcPnRXv/y7iRNj/raeB6bwXL9KGO6dp9KVpiiRUH8vSm
+jB6RIv/hhjrmda6cBgSoCMJMstMm18vGXJ5tUFRCkb6UMhCTcKqZ4N3UIQeHoeAy
+9AAH2GCUpXqaE9lCF4Q5dUxsikiZU8gjkIzBXmXhLc8UQJ4sFIHZM60Wq1EPfF5b
+ZFJuGKE1PnkOV3OXlcLKHiDCOKVsqOtUTuckrdLIi9i/iaYtq9T0loP9U4/cA5kg
+nUwP+thr2rhTvR0bvLrxaIjYZe4pgWW8xxpC9vjXVg==
+=2CmW
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.4.50_pre20140430.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.4.50_pre20140430.ebuild
new file mode 100644
index 000000000000..ea3f842b5e5c
--- /dev/null
+++ b/app-editors/emacs-vcs/emacs-vcs-24.4.50_pre20140430.ebuild
@@ -0,0 +1,367 @@
+# 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.4.50_pre20140430.ebuild,v 1.1 2014/05/02 07:51:57 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.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/attr
+		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([^,]*,[ \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/Xft_support_for_GNU_Emacs
+		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
+}