Version bump.

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

3 files changed, 357 insertions, 12 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 264e31a3786d..62a24cb7fdfb 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.671 2015/04/01 21:13:09 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.672 2015/04/06 10:55:15 ulm Exp $
+
+*emacs-24.5_rc3 (06 Apr 2015)
+
+  06 Apr 2015; Ulrich Müller <ulm@gentoo.org> +emacs-24.5_rc3.ebuild:
+  Version bump.
 
 *emacs-24.5_rc2 (01 Apr 2015)
 
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 84bb9c843b02..4b564beeb0db 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -16,6 +16,7 @@ DIST emacs-24.4.tar.xz 39733124 SHA256 47e391170db4ca0a3c724530c7050655f6d573a71
 DIST emacs-24.5-patches-1.tar.xz 3744 SHA256 dbcad232dff47e5540fff33351d76a92165e3d379a9c1fe52c04268a1ae245f8 SHA512 0c17546211493a521eec026e05722ebfa0988d2d97c916f8ddbe4d54220fbb6256cb8ad76769a8832fe7028051ecfe04d8ac46da71d7c5a6d2906b57466496db WHIRLPOOL 29cbd3513a62b025994918c6fbf86d70e282dfc0b1fc70639afcf356946e7c46ecc099a552e3735346d6b13c494db93246605eff002c34f1d0859ac04f1025fe
 DIST emacs-24.5-rc1.tar.xz 39754360 SHA256 f5c15527cf7b470423633c189ab1210a9ddef0f824b422f17dc00ca1bd015104 SHA512 e1ed771ba6d20df37f22a17a07ae0470fc2be4165c8ed989837eab2b1ddaae6814753d30496f8ff4b58961349f18aacecb9e3d59c021fed34a6bd9eb4517035f WHIRLPOOL 099a78e9001746dab8798d28322b39efaafd281cf8141a8b1ae448d9e8c70fcafe993fbc362c1ee799df1450f72da1d8dddbc28856d227821f104358acd442fe
 DIST emacs-24.5-rc2.tar.xz 39760256 SHA256 675fe8b01e1d91ca8fcf0d1f9370b06e75464851edd1e6f71ffbe14dfffeed3b SHA512 39e2c24e7f234a56f5535b334f709cb8dd6aa96f996f40e6a494a973b39ec2f9fc2e54a76c19db8e86c577535015f6459338f614bea7271133295fc534a49773 WHIRLPOOL 239d51dd8541481fd49441175d594115fef1f3feadace701f1ea9d21f52aaf4d2cdbfce00a7eb8c3f6e3279ad7adc47e5f640828642897a06db184a8d22ddad7
+DIST emacs-24.5-rc3.tar.xz 39760372 SHA256 180fee9e6adbeeeeb5e7f25012aa5c478d6324531415a94e63602ef122beaae5 SHA512 851f7058cd7e98b2310a8961531ef9fc5da6887e3bf6cbbef9ca1313df61dd8cb422981cd5fc24c83f65effb6a50c6a1293a555328d17b2a6e3d8e7168fdf9b5 WHIRLPOOL 3412609bf5db727b79b64418d920e129b48c5c8d8efa87198316ea125bc49252793a57dc0414e0394f1e5878d6371478828d3403d550e3613ab28e0fa5e36ffb
 EBUILD emacs-18.59-r10.ebuild 4211 SHA256 cb9d6d427e6a21c9b1f1826552cf114622715417ad225204fc8ed414b3602126 SHA512 04117c94aa6be849df6a649f36aceaecc0962c8b9ac4c1d842bf0cb3540d61b391b88f8cf907236e19dfbff97972d3f03326c36c16893eb4c653ddd465dda359 WHIRLPOOL 0531faa261e02362c5c3c3e6d4691328cae6b65355aae45800d12d51c2d53c1864360b01dd314342d84f09d3d206d76d3e73fa37f83b3532059a63f6b220c0fa
 EBUILD emacs-23.4-r11.ebuild 11322 SHA256 9b5ebb5a457a05ce7beeae825b46eff2ebb6897b5fcedf35a2027c9f6542bab7 SHA512 7dc9bb8bc5a005b3c1dc32f3d69fa102883c6609a1986720345c17d3c69977f1816404eff7175e3f7c756143fe231546b87651c9cad1ac6525cc45b41c1c7664 WHIRLPOOL 2c8086f875c1f71566475ae3f071a6f63ef32124401c75140201ba78d8b6e818a3ad84534fbb52985fba812012c32d105d09d8d65b929d04cef7f3fd2a9a1974
 EBUILD emacs-23.4-r13.ebuild 11307 SHA256 a1294b347c951edc199298caa7976a472b3d958c9babe1d33c95957c98a6eabd SHA512 7a78575b9cbda1e4b77208c552969a683c8eb76cb814053fdd1055c143e03ac152f86536ae8ac3e4023b21214ae07fb7245177e6ca8c65a93762e470d871d1ea WHIRLPOOL c18561ad4006800fa431b7aae086ba64bea4b2756cb9c9d92429a718190805ea5f454e513d7d59e7b9c6297156850d0976bff1a091865775e7b941c82a3648a9
@@ -24,19 +25,20 @@ EBUILD emacs-24.4-r1.ebuild 10676 SHA256 79d68eba3a693a304b37afbe5a29ade228c6922
 EBUILD emacs-24.4-r4.ebuild 10666 SHA256 6c6e16bd4746eccf5865ddee59f058a8fc126aa8cf58cb415fa0da0e8fb2d86d SHA512 4d4c36232a6719dee5870d45823256374a3dcb15d3120415a6ca574fb677a0313e742c3131286f8264691b82dee11f7df29ff075cf7670050ce686a93800f547 WHIRLPOOL 30414d58a5894fb7c36801bcae63edabc571637179502d9ab25c104070b5569fe3956cd23d3b7f4c123cb2076c6a20e46e88cec3a459af8f36869b5d1c781060
 EBUILD emacs-24.5_rc1.ebuild 10748 SHA256 2767c89a9bb848889f91c1d677001f1bd090664f1a36ed9d863ac2fb08b9f2c7 SHA512 8de1d26cae75a65f51834d60b980573056bab0996b95591a7421ff1317a2a6f4e189976caba1a727ca558d6d32f992988f43102af4b098bc86faf89f34a76177 WHIRLPOOL a5c7c60ac119f5003351b352894cc6ff204f876a643496c4e64d46fa722d1db07dcd5031ac62255d5636d65687b5d7bf50a1f742e0803dd4ea367199bf85559d
 EBUILD emacs-24.5_rc2.ebuild 10693 SHA256 484bdd6936a49b3e335a5d3bb0af59ece9ac2f6932e6f4a0378e2f817d572cb7 SHA512 cd8f63903d51db647ad151af4ae3fde24541d1e23eabe34f2e904e4268f32e2bff74bc04b775db13ab352e47738754ba2d3846a00d1b9f36902a84979c4a1eca WHIRLPOOL 8854e99f8246470682f2bc3f9924f00d0cf04e4b51c93f8cac46fcb8ef34759e55f6cc8b0c3c09124ed117691ef77a95987560e887b3e4af58badebc7a64178a
-MISC ChangeLog 91867 SHA256 9be810577a48787522c332dee42971e2d9de564d11760a0c2881925b4a13c767 SHA512 a049a0bacd9e9059f27082b0a1c083efd5beeac8f9a24cfa5e256b5884c079067f9ac08d70593d3b7a087a3a8dbf1ad67a5ff6d0247d7363d625f96bbeccf2d0 WHIRLPOOL 3188c62194b964d46bf8a9b89949487dc2416015a4a179f3bc4681c412431851aac05d2f7560a8f6be83f37f0dcdde2729b31c14ba18726c2606ce214cb8fc39
+EBUILD emacs-24.5_rc3.ebuild 10693 SHA256 06bf744b69dd02e3d08c919a754f1c3d685153c5fad7a218837bdb0b50f03751 SHA512 5d28582e8861f2eab2f6fe437b884fdbd08664fb88fff06a756c06e8fae6c4d0aaf73a9bc904b1a4ee28cfcab471ea3225f45436aae6a40e01219ce78ec6fa39 WHIRLPOOL 643c1d28183e70f7396c47170fba16324468ebdec5603a6a5536206ab437ba2f92087c53ca205be8a057028ada96372337f36faff6829f27e09c8be9393868cb
+MISC ChangeLog 91986 SHA256 76142293702b710ca62f3945dceb5c608c3e1159b87ed09ae84f70fe44028919 SHA512 d172c96caeab73c8756fac51aa69f9be8c899352086104bc51875a32d54c6d0c925a40436d329ab2d9c57bb7fc85fbca6e6478718739ed557211e163fa2cad45 WHIRLPOOL f570184f70964cb2bec19cf57caa66ba80cf103504bfdf0275dfb9d541c68318c1ad898e4dd0838ce79762b47898f64cdffa0aec9a7a62cf3e10094f2604967d
 MISC metadata.xml 2489 SHA256 21b3602d37aa25bca31b05ea810b37ee2192f4e53b8f8daeb814d9dca59d03d7 SHA512 4f3d663cd61253ae3390c55c5974dd3cc22dbf1306a823c3cb71794d09eaf28d7727c7e24f66f02dbd8d3845894f3a8cafa5ddaf330c1bbb7f99d8130ece077c WHIRLPOOL bcefdded503fa9cebea943952d3f56847002cb5ddc10f5adbd774301b648d1b12a09da7e493694f9cbbb19e8b53b66132cbd2e0141ded41b226415cfdbbcf8f6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGcBAEBCAAGBQJVHF9uAAoJEJQzkH1pP7W4lBUL/2e1zJ3rh3J/BGv8sOrtZYOh
-68AMtrEwl8VWRELZMHmAd8oJ8KFzGL5QDtavzD/iEq5pyfoCSSy+ssOicxP1pbo8
-XS8OM18GJkthj0TQ+T6c5Ed8Trbh+EZfmfQwhc4pNDfFscGquioQjqFm04/qeIVn
-FgdMYORY8G8Oa+HVE2yUbre6Rzmohm4RCWkPxythpKjsvOb7m4plAZB07euShCck
-uJwg4LFdRI8Xl2BW8/loX9ZZwvhlX8OJBq/fZOR6CPEpnGTkycWsaRoBioT26v4M
-pG34IVMr3R8yMCdeOK1ZhNuBJdPzWw4+LieyTe4DElNQRVoFkGtn+jcjRB7jXObi
-g+j8f8Tr4CZqsmr/XAiDYtMfzJWRsaoqlqnqKtf5IXOksHqWdRK8j7kfUnzfVx+z
-IIwAuj5jVP1MJwCjZ9+F0EUV79Nn7QqUUFKKXHNCqO6hqQb0DXM/bkKtU3wwvr4a
-QxQnYVdbBbUhLCdrIpe9ofDBCJLNv+IOqagtdr/FqA==
-=ksvq
+iQGcBAEBCAAGBQJVImYpAAoJEJQzkH1pP7W4wtgL/2sV8iADQninKIPnzUrMtPtA
+YhZJgwycup69Y/uCR2iFfdnjYKIPPpqKXF4TPhZJNb3FmdJJ3/rsCz+517FTvhFU
+VbjnO21amkjFkYp8UQca8wpBAfQhqt7OEtSR0TRG47NHIKjY5q/j+MsYx4D+P1fg
+X6QgLorTcbttEtJuDNKNhMJt6Bw6eRfKLIQX0835uEm/styiUK0DC5byLtWB9gLR
+KA8mkVhGTfE7GQLNpvZjPKC95IVvjnpU1AxmwudrJyK473WBeVNZjljBoXNXh844
+UkScAvn2JF+0DJtvNtbvrJcRPqirhtFSducTYm7uRKIC9IR+YR2YLMKto591cEuT
+SXCgozdsDwWeMACz3IBTcIA8bzdwMoVj6IK5vkyls73ZSdaJmoiYnz8Hp1aDr1TA
+kXc2NurDJaaaxl6emWzKiS34ZH+8i+oy7PJNDTjDz5z0H32DUldAcSMnbejmBn4g
+madkp1P2lMYuRb2lbV4I6nsfK5cx8w49p+MEQHt6rQ==
+=RBgV
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-24.5_rc3.ebuild b/app-editors/emacs/emacs-24.5_rc3.ebuild
new file mode 100644
index 000000000000..2958aa4107d6
--- /dev/null
+++ b/app-editors/emacs/emacs-24.5_rc3.ebuild
@@ -0,0 +1,338 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.5_rc3.ebuild,v 1.1 2015/04/06 10:55:15 ulm Exp $
+
+EAPI=5
+
+inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="http://www.gnu.org/software/emacs/"
+SRC_URI="mirror://gnu-alpha/emacs/pretest/${P/_/-}.tar.xz
+	http://dev.gentoo.org/~ulm/emacs/${P%_*}-patches-1.tar.xz"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+SLOT="24"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~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-eselect/eselect-emacs-1.16
+	>=app-emacs/emacs-common-gentoo-1.5[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:0 )
+		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}
+	virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )
+	pax_kernel? (
+		sys-apps/attr
+		sys-apps/paxctl
+	)"
+
+RDEPEND="${RDEPEND}
+	!<app-editors/emacs-vcs-${PV}"
+
+EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
+SITEFILE="20${PN}-${SLOT}-gentoo.el"
+# 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}"
+
+src_prepare() {
+	EPATCH_SUFFIX=patch epatch
+	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
+	filter-flags -pie					#526948
+
+	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}"
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--with-gameuser=":gamestat" \
+		--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
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+
+	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
+}