Version bump, release candidate for Emacs 24.2.

Package-Manager: portage-2.1.11.10/cvs/Linux x86_64

3 files changed, 361 insertions, 5 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index ff8ff35c4bb7..16792cba2212 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.516 2012/08/15 00:33:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.517 2012/08/15 19:07:44 ulm Exp $
+
+*emacs-24.2_rc1 (15 Aug 2012)
+
+  15 Aug 2012; Ulrich Müller <ulm@gentoo.org> +emacs-24.2_rc1.ebuild:
+  Version bump, release candidate for Emacs 24.2.
 
   15 Aug 2012; Jeroen Roovers <jer@gentoo.org> emacs-23.4-r4.ebuild,
   emacs-24.1-r1.ebuild:
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index c5cde4bfd946..06dd2cea6199 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -15,6 +15,8 @@ DIST emacs-23.4.tar.bz2 38646508 SHA256 26576f9e664397c729f78f5ffcd0929692519884
 DIST emacs-24.1-patches-4.tar.bz2 4296 SHA256 2dda7c1d74b4fd55937c41fd25401684c6a2998dcd27ada4c5bcca856743cbd7 SHA512 bba85091b10791b7539102f5e8ea961e62da1d9b7752225997ecbbe0c1dd80acadcb74e553a89c4fce0e16c2095938f2f565566aa71f003dd108ab73b7806dc1 WHIRLPOOL 7d950722a9b63d07163b3ca150faf134017e22f38b574adfeef206f29f5a696a469d8b9fa7eb62cc4087095bd2cbf7c91a3030ce3ce7f6c74766898471c3ba00
 DIST emacs-24.1-patches-5.tar.bz2 4720 SHA256 759ea6674b86a7943e95ecfc7d7809367bc6d1506e9b55099ce5e38c80845e9f SHA512 4f213d562237443bd441698e93a9860bdb783bb845412cd3ba5b96e0f029fc49196ffd9644482ae2804293195d621d586ba64ecae7a58e427b40853bcfd52677 WHIRLPOOL f6608221cff48aaeba07f6f98ce0faa75367fafebfb19bd71914cc3ee8a2d10cf7ab25be3735da75f01dd2b7549939d533d7e9d4b54c86d994a718dd6183d32e
 DIST emacs-24.1.tar.bz2 41722508 SHA256 eeea272732146e2be9aee2f8d71d6cf07b8654c0282da62a26b921d433f02b7c SHA512 aff89b54f2c6b30aa8c9bec8902a52b76ee1c5e4717b4c7385fe3a1583153d6857eed5351ce04f0a16d8fa93bb4b96804ade5dcfffc381094cbb7724934633ca WHIRLPOOL fc9343d464ec837dd069931a90c716e200ea8c67ea2e58d916e4bc3e00ad883c05e105161f6cec868d86ca7f6ec79b2a8a9f887fd3a247c1cfb885a4a685d3f6
+DIST emacs-24.2-patches-1.tar.bz2 2684 SHA256 0e941340c159d00091d4a275426caf90197dfca6afaee71c41c35b9c10c4c0fa SHA512 3880862267767e5243044412d8d92b30988362d3d09831df023fe284300527b33ebd587ff99ac1213556075d8c24d5f99a34f6eb4750f02e8cb261ca1b3cd249 WHIRLPOOL 855156dfd4fc996f92b994b8033211a0785d8720915d8c04a839c6dbdaf88178394ed2c3457c142eb643a1d7c076dc5e88f3fcef81fc03513a8000599a4d976c
+DIST emacs-24.2-rc1.tar.gz 52117279 SHA256 75343db1b5d7d9366f1daf9b6c4a68711fadde9bf1916c99dc52fbf26c3df7d7 SHA512 421336d03038d4ee79734bce1cddfbc760b14b2a06be19ac499b17c28d9d7d4ebf7590e9aca25f4fc7fddc56aa0a32e5dbb8f0dcef85086c5808589d40b5cf4f WHIRLPOOL 08992cfcdc3f6bcd27634b75cb652cb598335c96a0ebddb3ed6f380cbd6591fcfd770cce5aba29d16ad3a296ac76901429bd3fe027ee28bb406308f1c4e217fb
 DIST leim-21.4.tar.gz 3291433 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b SHA512 c361996f7a3fcc550e7af30a7df3f692071ded2c9dce998e72f537b0e8011f319cfae1742d0be463608a86852046cba23037a29c3ecdcbaf5976807e1d1a1e2c WHIRLPOOL d7f25d5d491f323b80609567ce5cbcb5f20109cdd4671e9972c79279a3ca5338bbf67d35ae8f0bc627bc06917f545d71ab1f66a09c647f47ddaea26772bfc5c1
 EBUILD emacs-18.59-r8.ebuild 4360 SHA256 89d4265e525b72fda6dd48285d836ccfb32baab21933ec396b68d195bb8e046e SHA512 7280d39fd2831d1d95d5ed99628bb8d18a62a62181e82b00ed432329f17682ae3f418977787857deb1f19da417d03fd3bf9b7616f611a63d69324d38cd8c665a WHIRLPOOL 538854d60683735989855d4d830fc34ff3b6e9a00c46f5626a63a58efe3c1ccb458766a5395870a41e07083a006c94029762c38fa7c80d4d789ba97b126d2ba9
 EBUILD emacs-21.4-r24.ebuild 5284 SHA256 776809827be73ed5d05200481616f773874afe57d3a1961af45d9a3ee21bf996 SHA512 b79676649cdf365d46766e0fbd9d194f4e67088edcce0f5629432ad50c31f82a10a0dfc02e087f7826f6bd1be420ceafc3f1d11a1eb28495922c47e0363baea0 WHIRLPOOL e2342b766e6330d05164cf6a32637d7016c11aa9bb1b890d532c8deff2269aff82af549945965c4dafaec53284758057732003159bd2bcf1ecf784bf266c4981
@@ -24,12 +26,23 @@ EBUILD emacs-23.4-r3.ebuild 10592 SHA256 85e6426f16500f39e3d6f418677e2a5815d732d
 EBUILD emacs-23.4-r4.ebuild 10592 SHA256 ee13a75ed61cf2f8bbde5ef611b6e40bdd96f1d2e5d1b2ac67cd41da6381a211 SHA512 d653156f52f0762a6778f668f370fbf1c9235b6c44ebdc5fcf8828000be765982a9018907279961343699a58d0c01ce27d1fcd343d3ea304c6df32d155b11973 WHIRLPOOL 9d5f7f705b49d38994d8de74583aa3c56ab3b6cf3ec1a26b0ea66fa3626f7816ee2f5a46a07902c5033db1c290af33b75b0bb693d71e367efb74711b80f953ea
 EBUILD emacs-24.1-r1.ebuild 11021 SHA256 2b8d176e7998522c0daa4d6f722c1dbf451c29154cc30008c221919872d3fd85 SHA512 f7af56960c92af2fa95a4ef7cc96168b0fe1828627bb18d5cad464b53bce9911f70ad7381a88ae9715b44e4c78afaa2d3cd871274dfeda861eaaafaf4f6818f3 WHIRLPOOL db6d4ddab3e0f9ea00b3d151a7bba1e77bb514085a7d8a041069dcd183e2f3e75ac387bf6070d9ce0a099862febc1ba28416a8aed837c1676f83b2833e6d26ed
 EBUILD emacs-24.1.ebuild 11019 SHA256 9503252f00d8fa45c94e04c6cabd0ddcca4913b415e9063787eb3a6761d746d9 SHA512 c1432db9e5c174fc2de411d66c2a26a77dfd1d9defffe6b83fc112dae7358e59a9f27c45efc2627952fafe8e76167930ecc04ad63819a038ff15576c41175b32 WHIRLPOOL 185b91bd00fcfe8ab59d264b1a279654b95425611702076ab60f8584e284ea84cfa8246b004c2a79d82d42b1e73ddf17b69e573ae0b7225ae9e63f18ce6cfb9b
-MISC ChangeLog 73044 SHA256 dd9ed4cf3763b9e603491437c27e2afed0419dc892244e985d4cd386274e2c43 SHA512 55aa54609e4a551bcbb95e98819fe01a5bc0483a1e99d7fc54ef9ff8ab3686784110fa30fbccbc164c05378e4175edaf1c3bd1e5151bc3cf33fc07ab4dfddd04 WHIRLPOOL e3973367579ff1d06e1b00c999bd412bfa80de42e99c5e4bd2a51c63bd0889cb1f1725856ae7462fd57008fff445ca51485944683df44f4a8a9f357b1743ee59
+EBUILD emacs-24.2_rc1.ebuild 11045 SHA256 a2e643d47221032390ec4d9ff0bf80222919b5257a25148bccdc4ba87d64c9c8 SHA512 cf26583ec29491dac1de3a244751aab0b2438eb4b3278c33521dd7adfcf050893c711509ce4f56cb8bb520fb56e4c6650acb501444dfc42a02aa2f9ceab8629c WHIRLPOOL e21fffec0f429dee2ae48783ea5602dee80060ac9e00074e855994d68f17510ab845fd4a681dc26b1d144dac873aadf251f6436cc469c5111db9c31ac85b1af1
+MISC ChangeLog 73197 SHA256 10066b80814b697dd7db721dadff0eed1654dfd722ca193d5cb41e5f4235d3e9 SHA512 f1fbf1caea72f066574cf2cf3be98e989ddbd0aae89fad0ddfd46f6d079a462e0295a5f783074a99af1231f6bb7d4cd88ef3da30fa85037bb00e4dc7dd7ff27e WHIRLPOOL d60f748a725976bf6afd43a0f41ed6cbb524f346d3f4af8b42c30d66547306560e84c4e8390e9a9f35d942940aa4045356a5370c85d18cb70a516768305ab107
 MISC metadata.xml 2456 SHA256 8bdd732f4d55f61ff12d6b3e2bb86fde9179d6e28a2db04fa8f6e1ce370309b1 SHA512 187c76b76f48ef69232ce84a51e316f636b8cd14489de29313698ba3b1ac8abe7d705fc3c833d2c685d4a671df35508c5d973f32cd43eaf03ecd7e8e8740448f WHIRLPOOL eed1249a1876926833184777917d88d281a0b1ec86f79cfb064b60d4cc09a9047cf08beb726dfe3fb9f5f36c58ebe16b1989f5bd158a9b945cc489039807c4e4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAq7k8ACgkQVWmRsqeSphMYngCdEHO5tExkxKt5g/4jD9kHbp2P
-MYcAn1/GO3tXiYyoquRraqMfhmwKgb7H
-=nGRr
+iQIcBAEBCAAGBQJQK/U9AAoJEDxpGckxwJCBPxgQAJsPF2U7gmV3ImgFSXwA6mjM
+p6TaaT834c6Garc3TbQ0Omzg7L8G4LMO8ChQOtH0udrS9nq1dv4yZFMZ8DgoUwwd
+W5wb9NvwJhDhD61VvAqF4NBX5ZNKhWSi+EmHWpAFgG8U2/OMyxF/QH3nACt9XUEx
+wbX1bat6YG4osLRDNMCsbwMU44jP/BnrQXhI2A2xlHj9F5qJ186w3TGPA6KN9UXx
+AWx8uiqVBpLWimGSPjknabo3lvf34x8q73S9l74y4q1mzEp9aoY6PnlE5gXO86+q
+c2d2MXwo4FSpDHdipPMxneO6RVZSV27ZUF9gVVXO+oGQhcB56Gvb0ILX37/yZH9E
+VOI7puMDRHIXg8Wih/Dk0rmtTIp3SI9hvjX3mSrVRXyrRQdpp1Wl5ZLXsBt16Fig
+ldJ9sHduYK0a0MGAGzdoj9ZnuU5YbjiMbm7gE6tkE+AjADDaqh78C/2EhUmf5H9C
+qpDzcMIiJfdv3HnAw9mUNLzjEACaJEIOzKYaS1h6TZFFy2l1m92zpkAiYS9VF4Ar
+hZirPUxTSdxUsSw6OkCH4hsZu1zUALcwJ283/G6zQEBPF4AB4OE+EjMk1oANvJUw
+cv1FHdigATf6wHJdHUuQX4dZKMC5bowiC+S2RPlpopXOCVWe2x0WAStXZj+c7BUE
+PvF5bECzacCFjr5FFzgc
+=M5rX
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-24.2_rc1.ebuild b/app-editors/emacs/emacs-24.2_rc1.ebuild
new file mode 100644
index 000000000000..5decf04d5e8d
--- /dev/null
+++ b/app-editors/emacs/emacs-24.2_rc1.ebuild
@@ -0,0 +1,338 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.2_rc1.ebuild,v 1.1 2012/08/15 19:07:44 ulm Exp $
+
+EAPI=4
+
+inherit autotools elisp-common eutils flag-o-matic multilib
+
+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.gz
+	mirror://gentoo/${P%%_*}-patches-1.tar.bz2"
+
+LICENSE="GPL-3 FDL-1.3 BSD as-is 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 ~sparc-solaris ~x86-solaris"
+IUSE="alsa aqua athena dbus games gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
+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
+	hesiod? ( net-dns/hesiod )
+	kerberos? ( virtual/krb5 )
+	alsa? ( media-libs/alsa-lib )
+	gpm? ( sys-libs/gpm )
+	dbus? ( sys-apps/dbus )
+	gnutls? ( net-libs/gnutls )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
+	selinux? ( sys-libs/libselinux )
+	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 )
+		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? (
+			Xaw3d? ( x11-libs/libXaw3d )
+			!Xaw3d? (
+				athena? ( x11-libs/libXaw )
+				!athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
+			)
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	alsa? ( virtual/pkgconfig )
+	dbus? ( virtual/pkgconfig )
+	gnutls? ( virtual/pkgconfig )
+	libxml2? ( virtual/pkgconfig )
+	X? ( virtual/pkgconfig )
+	gzip-el? ( app-arch/gzip )
+	pax_kernel? ( sys-apps/paxctl )"
+
+RDEPEND="${RDEPEND}
+	!<app-editors/emacs-vcs-24.1.9999-r1"
+
+EMACS_SUFFIX="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
+
+	if ! use alsa; then
+		# ALSA is detected even if not requested by its USE flag.
+		# Suppress it by supplying pkg-config with a wrong library name.
+		sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
+			|| die "unable to sed configure.in"
+	fi
+	if ! use gzip-el; then
+		# Emacs' build system automatically detects the gzip binary and
+		# compresses el files. We don't want that so confuse it with a
+		# wrong binary name
+		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
+			|| die "unable to sed configure.in"
+	fi
+
+	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 && ! use sound; then
+		einfo "Although sound USE flag is disabled you chose to have alsa,"
+		einfo "so sound is switched on anyway."
+		myconf="${myconf} --with-sound"
+	else
+		myconf="${myconf} $(use_with sound)"
+	fi
+
+	if use X; then
+		myconf="${myconf} --with-x --without-ns"
+		myconf="${myconf} $(use_with gconf)"
+		myconf="${myconf} $(use_with gsettings)"
+		myconf="${myconf} $(use_with toolkit-scroll-bars)"
+		myconf="${myconf} $(use_with gif) $(use_with jpeg)"
+		myconf="${myconf} $(use_with png) $(use_with svg rsvg)"
+		myconf="${myconf} $(use_with tiff) $(use_with xpm)"
+		myconf="${myconf} $(use_with imagemagick)"
+
+		if use xft; then
+			myconf="${myconf} --with-xft"
+			myconf="${myconf} $(use_with m17n-lib libotf)"
+			myconf="${myconf} $(use_with m17n-lib m17n-flt)"
+		else
+			myconf="${myconf} --without-xft"
+			myconf="${myconf} --without-libotf --without-m17n-flt"
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			myconf="${myconf} --with-x-toolkit=$(usev gtk3 || echo gtk)"
+			local f
+			for f in athena Xaw3d motif; do
+				use ${f} && ewarn "USE flag \"${f}\" ignored" \
+					"(superseded by \"gtk\")"
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+			use motif && ewarn "USE flag \"motif\" ignored" \
+				"(superseded by \"athena\" or \"Xaw3d\")"
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf="${myconf} --with-x-toolkit=motif"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf="${myconf} --with-x-toolkit=no"
+		fi
+
+		! use gtk && use gtk3 \
+			&& ewarn "USE flag \"gtk3\" has no effect if \"gtk\" is not set."
+	elif use aqua; then
+		einfo "Configuring to build with Cocoa support"
+		myconf="${myconf} --with-ns --disable-ns-self-contained"
+		myconf="${myconf} --without-x"
+	else
+		myconf="${myconf} --without-x --without-ns"
+	fi
+
+	# Save version information in the Emacs binary. It will be available
+	# in variable "system-configuration-options".
+	myconf="${myconf} GENTOO_PACKAGE=${CATEGORY}/${PF}"
+
+	# According to configure, this option is only used for GNU/Linux
+	# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
+	# out the location because $(get_libdir) does not necessarily return
+	# something that matches the host OS's libdir naming (e.g. RHEL).
+	local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
+	crtdir=${crtdir%/*}
+
+	econf \
+		--program-suffix=-${EMACS_SUFFIX} \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--with-crt-dir="${crtdir}" \
+		--with-gameuser="${GAMES_USER_DED:-games}" \
+		--without-compress-info \
+		--disable-maintainer-mode \
+		$(use_with hesiod) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with gpm) \
+		$(use_with dbus) \
+		$(use_with gnutls) \
+		$(use_with libxml2 xml2) \
+		$(use_with selinux) \
+		$(use_with wide-int) \
+		${myconf}
+}
+
+src_compile() {
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	emake CC="$(tc-getCC)"
+}
+
+src_install () {
+	emake install DESTDIR="${D}"
+
+	rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
+		|| die "removing duplicate emacs executable failed"
+	mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
+		|| die "moving Emacs executable failed"
+
+	# move man pages to the correct place
+	local m
+	for m in "${ED}"/usr/share/man/man1/* ; do
+		mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed"
+	done
+
+	# 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
+
+	local c=";;"
+	if use source; then
+		insinto /usr/share/emacs/${FULL_VERSION}/src
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+		doins -r src/{m,s}
+		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
+		c=""
+	fi
+
+	sed 's/^X//' >"${T}/${SITEFILE}" <<-EOF
+	X
+	;;; ${PN}-${SLOT} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	X  ${c}(setq find-function-C-source-directory
+	X  ${c}      "${EPREFIX}/usr/share/emacs/${FULL_VERSION}/src")
+	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
+		elog "Emacs${EMACS_SUFFIX#emacs}.app is in ${EPREFIX}/Applications/Gentoo."
+		elog "You may want to copy or symlink it into /Applications by yourself."
+	fi
+}
+
+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
+
+	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
+
+	if use X; then
+		elog "You need to install some fonts for Emacs."
+		elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
+		elog "machine would satisfy basic Emacs requirements under X11."
+		elog "See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml"
+		elog "for how to enable anti-aliased fonts."
+		elog
+	fi
+
+	elog "You can set the version to be started by /usr/bin/emacs through"
+	elog "the Emacs eselect module, which also redirects man and info pages."
+	elog "Therefore, several Emacs versions can be installed at the same time."
+	elog "\"man emacs.eselect\" for details."
+	elog
+	elog "If you upgrade from a previous major version of Emacs, then it is"
+	elog "strongly recommended that you use app-admin/emacs-updater to rebuild"
+	elog "all byte-compiled elisp files of the installed Emacs packages."
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}